Merge pull request #12 from mcbegamerxx954/main

Auto shaderfixing

Author: ENDERMANYK

build.bat

@@ -1,7 +1,7 @@
 @echo off
 
-set CLANG_OPTS_ARM=--target=armv7a-linux-androideabi21 -shared -s -O2 -fPIC -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -DANDROID -ffunction-sections -fdata-sections -mthumb -I./frida/arm/include -L./frida/arm/lib -lfrida-gum -llog -ldl -lm -pthread -Wl,--fix-cortex-a8,-z,relro,-z,noexecstack,--gc-sections
-set CLANG_OPTS_ARM64=--target=aarch64-linux-android21 -shared -s -O2 -fPIC -DANDROID -ffunction-sections -fdata-sections -I./frida/arm64/include -L./frida/arm64/lib -lfrida-gum -llog -ldl -lm -pthread -Wl,--gc-sections,-z,noexecstack,-z,relro,-z,now
+set CLANG_OPTS_ARM=--target=armv7a-linux-androideabi21 -shared -s -O2 -fPIC -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -DANDROID -ffunction-sections -fdata-sections -mthumb -I./frida/arm/include -I./libmaterial/include -L./frida/arm/lib -lfrida-gum -llog -ldl -lm -pthread  ./libmaterial/armv7/lib/libmaterialbin.a  -Wl,--fix-cortex-a8,-z,relro,-z,noexecstack,--gc-sections
+set CLANG_OPTS_ARM64=--target=aarch64-linux-android21 -shared -s -O2 -fPIC -DANDROID -ffunction-sections -fdata-sections -I./libmaterial/include -I./frida/arm64/include -L./frida/arm64/lib -lfrida-gum -llog -ldl -lm -pthread  ./libmaterial/arm64/lib/libmaterialbin.a -Wall -Wl,--gc-sections,-z,noexecstack,-z,relro,-z,now
 
 if not exist "build" md "build"
 
@@ -13,4 +13,4 @@ clang++.exe %CLANG_OPTS_ARM% ./src/*.cpp -o ./build/libmaterialbinloader-arm.so
 echo libmaterialbinloader-arm64.so
 clang++.exe %CLANG_OPTS_ARM64% ./src/*.cpp -o ./build/libmaterialbinloader-arm64.so
 
-pause
+pause

build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-CLANG_OPTS_ARM="--target=armv7a-linux-androideabi21 -shared -s -O2 -fPIC -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -DANDROID -ffunction-sections -fdata-sections -mthumb -I./frida/arm/include -L./frida/arm/lib -lfrida-gum -llog -ldl -lm -pthread -Wl,--fix-cortex-a8,-z,relro,-z,noexecstack,--gc-sections"
-CLANG_OPTS_ARM64="--target=aarch64-linux-android21 -shared -s -O2 -fPIC -DANDROID -ffunction-sections -fdata-sections -I./frida/arm64/include -L./frida/arm64/lib -lfrida-gum -llog -ldl -lm -pthread -Wl,--gc-sections,-z,noexecstack,-z,relro,-z,now"
+CLANG_OPTS_ARM="--target=armv7a-linux-androideabi21 -shared -s -O2 -fPIC -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -DANDROID -ffunction-sections -fdata-sections -mthumb -I./frida/arm/include -I./libmaterial/include -L./frida/arm/lib -lfrida-gum -llog -ldl -lm -pthread ./libmaterial/armv7/lib/libmaterialbin.a -Wl,--fix-cortex-a8,-z,relro,-z,noexecstack,--gc-sections"
+CLANG_OPTS_ARM64="--target=aarch64-linux-android21 -shared -s -O2 -fPIC -DANDROID -ffunction-sections -fdata-sections -I./libmaterial/include -I./frida/arm64/include -L./frida/arm64/lib -lfrida-gum -llog -ldl -lm -pthread ./libmaterial/arm64/lib/libmaterialbin.a -Wall -Wl,--gc-sections,-z,noexecstack,-z,relro,-z,now"
 
 mkdir -p build
 

libmaterial/arm64/lib/libmaterialbin.a

@@ -0,0 +1,24 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+// A raw buffer of bytes from rust
+struct Buffer {
+  uint8_t *data;
+  uintptr_t len;
+};
+
+extern "C" {
+
+/// Update a material file
+/// # Safety
+/// - Input pointer and length are valid
+/// - You free the output later
+int update_file(uintptr_t input_len, const uint8_t *input_data, Buffer *out_buffer);
+
+/// Free the output
+void free_buf(Buffer buf);
+
+} // extern "C"

libmaterial/armv7/lib/libmaterialbin.a

@@ -1,3 +1,4 @@
+#include <cassert>
 #include <cstdio>
 #include <cstring>
 #include <cstdint>
@@ -7,6 +8,8 @@
 
 #include "frida-gum.h"
 #include "Util.h"
+#include "material.h"
+
 
 //==========================================================================================================================================
 
@@ -210,6 +213,7 @@ static void loader_invocation_listener_on_enter(GumInvocationListener* listener,
                 #ifdef DEBUG
                     printf("filename=%s\n", data);
                 #endif
+                
                 state->redirect = true;
                 state->filename = filename;
                 #if __arm__
@@ -219,6 +223,7 @@ static void loader_invocation_listener_on_enter(GumInvocationListener* listener,
                 #else
                     #error unsupported architecture
                 #endif
+
             }
 
             break;
@@ -260,12 +265,24 @@ static void loader_invocation_listener_on_leave(GumInvocationListener* listener,
                     std::string resourceStream;
                     bool result = load(resourcePackManager, &location, &resourceStream);
 
-                    if (result) {
+                    if (result && !resourceStream.empty()) {
+                        bool successful_update = true;
+
+                        struct Buffer outbufdata = {0,0};
+                        if (update_file(resourceStream.length(), (const uint8_t*)resourceStream.c_str(), &outbufdata) != 0) {
+                            puts("Updating failed!");
+                            successful_update = false;
+                            free_buf(outbufdata);
+                        }
+                        
                         #ifdef DEBUG
                             printf("ResourcePackManager::load returned true\n");
                         #endif
-                        if (!resourceStream.empty()) {
+                        if (!successful_update) {
                             state->retstr->assign(resourceStream);
+                        } else {
+                            state->retstr->assign((const char*)outbufdata.data, outbufdata.len);
+                            free_buf(outbufdata);
                         }
                     } else {
                         #ifdef DEBUG