From 5a7145a5acfe35947cc07ff5eb1fbc1e822b1806 Mon Sep 17 00:00:00 2001
From: yuanyuanxiang <yuan_yuanxiang@163.com>
Date: Sun, 25 Aug 2019 10:06:31 +0800
Subject: [PATCH] =?UTF-8?q?style:=E8=A7=A3=E5=86=B3=E9=87=87=E7=94=A8VS201?=
 =?UTF-8?q?5=E7=BC=96=E8=AF=91=E6=97=B6=E6=9F=90=E4=BA=9B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReadMe.txt                       |   5 ++++-
 client/ClientDll_vs2015.vcxproj  |   6 ++++--
 client/TestRun_vs2015.vcxproj    |   2 ++
 client/ghost.vcxproj.user        |   2 +-
 server/2015Remote/2015Remote.rc  | Bin 48982 -> 49002 bytes
 server/2015Remote/SettingDlg.cpp |   8 ++++++++
 server/2015Remote/SettingDlg.h   |   1 +
 使用方法.txt                     |  17 +++++++++++++++++
 8 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 使用方法.txt

diff --git a/ReadMe.txt b/ReadMe.txt
index df4e060..4bd3a70 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,4 +1,4 @@
-[简介]
+[简介]
 
 基于gh0st的远程控制器：实现了终端管理、进程管理、窗口管理、桌面管理、文件管理、语音管理、视频管理、服务管理、注册表管理等功能。
 
@@ -213,3 +213,6 @@ TestRun在写入开机自启动项时先提升权限，以防止因权限不足
 
 2019.5.11
 优化远程桌面发送屏幕的功能，可动态调整发送屏幕的速率。
+
+2019.8.25
+调整项目设置，解决采用VS2015编译时某些项目不通过的问题。
diff --git a/client/ClientDll_vs2015.vcxproj b/client/ClientDll_vs2015.vcxproj
index dd306da..846f066 100644
--- a/client/ClientDll_vs2015.vcxproj
+++ b/client/ClientDll_vs2015.vcxproj
@@ -44,16 +44,18 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
     <LibraryPath>$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
+    <IntDir>$(Configuration)\dll</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LibraryPath>$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
     <IncludePath>$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
+    <IntDir>$(Configuration)\dll</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./;$(WindowsSdkDir_81)Include\um;$(WindowsSdkDir_81)Include\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -72,7 +74,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>./;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./;$(WindowsSdkDir_81)Include\um;$(WindowsSdkDir_81)Include\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
diff --git a/client/TestRun_vs2015.vcxproj b/client/TestRun_vs2015.vcxproj
index 0cb4be7..23388d3 100644
--- a/client/TestRun_vs2015.vcxproj
+++ b/client/TestRun_vs2015.vcxproj
@@ -43,10 +43,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
     <LibraryPath>$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
+    <IntDir>$(Configuration)\test</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IncludePath>$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
     <LibraryPath>$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
+    <IntDir>$(Configuration)\test</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/client/ghost.vcxproj.user b/client/ghost.vcxproj.user
index 1c3ab07..5c4975f 100644
--- a/client/ghost.vcxproj.user
+++ b/client/ghost.vcxproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>127.0.0.1 2356</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>127.0.0.1 6543</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc
index 39eae70a46ea3f56d1d02bafc3c56d9fa46dae04..689ddafb0eac684fa6ff2f9a9fbdd2778d5e5280 100644
GIT binary patch
delta 65
zcmccikLlGvrVVo@aNlVT4c1^#V{l{8oLt!L$g;0HuYR&jwZ&uuK90!>6P;K=l7W*I
PtBs)|0-IM&T%!vBJ!%&*

delta 47
zcmV+~0MP&H{sPwi0<fHr2TcHB0BHbjlW~hd1ip)If0Iz1K9er29Fu;GT$3=7470wG
FtS$D&6s`aO

diff --git a/server/2015Remote/SettingDlg.cpp b/server/2015Remote/SettingDlg.cpp
index baecf11..bec4317 100644
--- a/server/2015Remote/SettingDlg.cpp
+++ b/server/2015Remote/SettingDlg.cpp
@@ -96,3 +96,11 @@ void CSettingDlg::OnEnChangeEditMax()
 	::ShowWindow(hApplyButton,SW_NORMAL);
 	::EnableWindow(hApplyButton,TRUE);
 }
+
+
+void CSettingDlg::OnOK()
+{
+	OnBnClickedButtonSettingapply();
+
+	CDialog::OnOK();
+}
diff --git a/server/2015Remote/SettingDlg.h b/server/2015Remote/SettingDlg.h
index e16f426..a75622e 100644
--- a/server/2015Remote/SettingDlg.h
+++ b/server/2015Remote/SettingDlg.h
@@ -27,4 +27,5 @@ public:
 	afx_msg void OnEnChangeEditPort();
 	afx_msg void OnEnChangeEditMax();
 	CButton m_ApplyButton;
+	virtual void OnOK();
 };
diff --git a/使用方法.txt b/使用方法.txt
new file mode 100644
index 0000000..196cfb8
--- /dev/null
+++ b/使用方法.txt
@@ -0,0 +1,17 @@
+【使用方法】
+
+首先请编译这4个项目，确保都成功通过，然后到生成目录，例如Debug（或Release）。
+
+1、打开Yama应用程序，点击Yama应用程序的“生成客户端”图标；
+
+2、填写目标IP（可以填域名，例如www.baidu.com）和端口（例如6666）；
+
+3、点击“确定”，这时候会在Debug目录生成一个名为"ClientDemo.exe"的可执行程序；
+
+4、想办法把"ClientDemo.exe"和"ServerDll.dll"一起拷贝到想要被控制的电脑，运行起来；
+
+5、把Yama拷贝到目标IP的机器运行起来，点击设置菜单，设置端口号为6666，点击“应用”或“确定”按钮；
+
+6、重启Yama，等待被控电脑连接，如果有电脑运行了"ClientDemo.exe"，则会在界面显示。
+
+2019-8-25