From 483d090515937975f8a27cccdfe34cbf781403b8 Mon Sep 17 00:00:00 2001
From: yuanyuanxiang <962914132@qq.com>
Date: Tue, 14 Jan 2025 23:55:37 +0800
Subject: [PATCH] fix: #33 File gh0st2Remote.h can be merged

---
 server/2015Remote/FileManagerDlg.h | 29 ++++++++++++++++++++++++-
 server/2015Remote/gh0st2Remote.h   | 35 ------------------------------
 2 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100644 server/2015Remote/gh0st2Remote.h

diff --git a/server/2015Remote/FileManagerDlg.h b/server/2015Remote/FileManagerDlg.h
index 7e12be0..533b936 100644
--- a/server/2015Remote/FileManagerDlg.h
+++ b/server/2015Remote/FileManagerDlg.h
@@ -4,7 +4,34 @@
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
-#include "gh0st2Remote.h"
+
+#include "IOCPServer.h"
+
+#define CIOCPServer IOCPServer
+
+#define ClientContext CONTEXT_OBJECT
+
+typedef struct
+{
+	DWORD	dwSizeHigh;
+	DWORD	dwSizeLow;
+}FILESIZE;
+
+#define m_DeCompressionBuffer InDeCompressedBuffer
+
+#define GetBufferLen GetBufferLength
+
+#define m_Dialog hDlg
+
+#define m_Socket sClientSocket
+
+#define Send OnClientPreSending
+
+#define MAKEINT64(low, high) ((unsigned __int64)(((DWORD)(low)) | ((unsigned __int64)((DWORD)(high))) << 32))
+
+#define	MAX_WRITE_RETRY			15 // 重试写入文件次数
+#define	MAX_SEND_BUFFER			1024 * 8 // 最大发送数据长度
+#define MAX_RECV_BUFFER			1024 * 8 // 最大接收数据长度
 
 #define WM_MY_MESSAGE (WM_USER+300)
 
diff --git a/server/2015Remote/gh0st2Remote.h b/server/2015Remote/gh0st2Remote.h
deleted file mode 100644
index a69859e..0000000
--- a/server/2015Remote/gh0st2Remote.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/************************************************************************
-* @file gh0st2Remote.h
-* @brief 灏咶ileManagerDlg銆両nputDlg銆丗ileTransferModeDlg銆乀rueColorToolBar
-*	杩樺師鍒癵h0st鏈�鍒濈増鏈��
-************************************************************************/
-
-#pragma once
-
-#include "IOCPServer.h"
-
-#define CIOCPServer IOCPServer
-
-#define ClientContext CONTEXT_OBJECT
-
-typedef struct 
-{
-	DWORD	dwSizeHigh;
-	DWORD	dwSizeLow;
-}FILESIZE;
-
-#define m_DeCompressionBuffer InDeCompressedBuffer
-
-#define GetBufferLen GetBufferLength
-
-#define m_Dialog hDlg
-
-#define m_Socket sClientSocket
-
-#define Send OnClientPreSending
-
-#define MAKEINT64(low, high) ((unsigned __int64)(((DWORD)(low)) | ((unsigned __int64)((DWORD)(high))) << 32))
-
-#define	MAX_WRITE_RETRY			15 // 閲嶈瘯鍐欏叆鏂囦欢娆℃暟
-#define	MAX_SEND_BUFFER			1024 * 8 // 鏈�澶у彂閫佹暟鎹暱搴�
-#define MAX_RECV_BUFFER			1024 * 8 // 鏈�澶ф帴鏀舵暟鎹暱搴�