attempting to fix struct params on string return

geode-sdk · Jun 3, 2024 · e5f76ea · e5f76ea
1 parent 7e52ec4
commit e5f76ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/include/tulip/platform/Windows64Convention.hpp b/include/tulip/platform/Windows64Convention.hpp
@@ -28,6 +28,7 @@ namespace tulip::hook {
 
 		void generateIntoDefault(BaseAssembler& a, AbstractFunction const& function) override;
 		void generateIntoOriginal(BaseAssembler& a, AbstractFunction const& function) override;
+		void generateOriginalCleanup(BaseAssembler& a, AbstractFunction const& function) override;
 		bool needsWrapper(AbstractFunction const& function) const override;
 
 		static std::shared_ptr<ThiscallConvention> create();

diff --git a/src/convention/Windows64Convention.cpp b/src/convention/Windows64Convention.cpp
@@ -104,7 +104,13 @@ void ThiscallConvention::generateIntoOriginal(BaseAssembler& a_, AbstractFunctio
         a.xchg(RCX, RDX);
     }
 
-    Windows64Convention::generateIntoOriginal(a, function);
+    // the wrapper requires the struct forwarding as well
+    Windows64Convention::generateIntoDefault(a, function);
+}
+
+void ThiscallConvention::generateOriginalCleanup(BaseAssembler& a_, AbstractFunction const& function) {
+    // the wrapper requires the struct forwarding as well
+    Windows64Convention::generateDefaultCleanup(a_, function);
 }
 
 bool ThiscallConvention::needsWrapper(AbstractFunction const& function) const {