diff --git a/CcRemote/.vs/CcRemote/v15/.suo b/CcRemote/.vs/CcRemote/v15/.suo index 9b19351..4771c2d 100644 Binary files a/CcRemote/.vs/CcRemote/v15/.suo and b/CcRemote/.vs/CcRemote/v15/.suo differ diff --git a/CcRemote/CcRemote/CScreenSpyDlg.cpp b/CcRemote/CcRemote/CScreenSpyDlg.cpp index aa5e576..cbfe44a 100644 --- a/CcRemote/CcRemote/CScreenSpyDlg.cpp +++ b/CcRemote/CcRemote/CScreenSpyDlg.cpp @@ -169,7 +169,7 @@ BOOL CScreenSpyDlg::OnInitDialog() m_RemoteCursorPos.x = 0; m_bIsTraceCursor = false; - // 初始化窗口大小结构 这里的初始化就不讲解了,同服务端一样的位图的图像数据 + // 初始化窗口大小结构 位图的图像数据 //是我们分配好的缓冲区也就是说我们可以更改这个缓冲区里的数据来改变位图图像 m_hDC = ::GetDC(m_hWnd); m_hMemDC = CreateCompatibleDC(m_hDC); diff --git a/CcRemote/CcRemote/CcRemoteDlg.cpp b/CcRemote/CcRemote/CcRemoteDlg.cpp index a0f44e5..95d115b 100644 --- a/CcRemote/CcRemote/CcRemoteDlg.cpp +++ b/CcRemote/CcRemote/CcRemoteDlg.cpp @@ -358,6 +358,7 @@ int CCcRemoteDlg::InitMyMenu() ::DrawMenuBar(this->GetSafeHwnd()); //显示菜单 popup.LoadMenu(IDR_MENU_ONLINE);//载入菜单资源 + //popup.GetSubMenu(0)->SetMenuItemBitmaps(); ::MENUINFO lpcmi; m_brush.CreateSolidBrush(RGB(236, 153, 101));//颜色 memset(&lpcmi, 0, sizeof(::LPCMENUINFO)); diff --git a/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log b/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log index 35a28bf..3dc0e77 100644 --- a/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log +++ b/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log @@ -1,30 +1,30 @@ -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.pch -g:\ccremote\ccremote\ccremote\ccremote\debug\vc141.pdb -g:\ccremote\ccremote\ccremote\ccremote\debug\vc141.idb -g:\ccremote\ccremote\ccremote\ccremote\debug\pch.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\truecolortoolbar.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\seu_qqwry.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\inifile.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\cpuusage.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\csystemdlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\cshelldlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\csettingdlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\cscreenspydlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremotedlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\iocpserver.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\buffer.obj -g:\ccremote\ccremote\bin\ccremote.ilk -g:\ccremote\ccremote\bin\ccremote.exe -g:\ccremote\ccremote\bin\ccremote.pdb -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.res -g:\ccremote\ccremote\ccremote\ccremote\..\..\bin\ccremote.exe -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\cl.command.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\cl.read.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\cl.write.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\link.command.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\link.read.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\link.write.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\rc.command.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\rc.read.1.tlog -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.tlog\rc.write.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.pch +f:\myapp\ccremote\ccremote\ccremote\debug\vc141.pdb +f:\myapp\ccremote\ccremote\ccremote\debug\vc141.idb +f:\myapp\ccremote\ccremote\ccremote\debug\pch.obj +f:\myapp\ccremote\ccremote\ccremote\debug\truecolortoolbar.obj +f:\myapp\ccremote\ccremote\ccremote\debug\seu_qqwry.obj +f:\myapp\ccremote\ccremote\ccremote\debug\inifile.obj +f:\myapp\ccremote\ccremote\ccremote\debug\cpuusage.obj +f:\myapp\ccremote\ccremote\ccremote\debug\csystemdlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\cshelldlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\csettingdlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\cscreenspydlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\ccremotedlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.obj +f:\myapp\ccremote\ccremote\ccremote\debug\iocpserver.obj +f:\myapp\ccremote\ccremote\ccremote\debug\buffer.obj +f:\myapp\ccremote\bin\ccremote.ilk +f:\myapp\ccremote\bin\ccremote.exe +f:\myapp\ccremote\bin\ccremote.pdb +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.res +f:\myapp\ccremote\ccremote\ccremote\..\..\bin\ccremote.exe +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\cl.command.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\cl.read.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\cl.write.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\link.command.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\link.read.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\link.write.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\rc.command.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\rc.read.1.tlog +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.tlog\rc.write.1.tlog diff --git a/CcRemote/CcRemote/Debug/CcRemote.log b/CcRemote/CcRemote/Debug/CcRemote.log index f132222..7fa7203 100644 --- a/CcRemote/CcRemote/Debug/CcRemote.log +++ b/CcRemote/CcRemote/Debug/CcRemote.log @@ -1,43 +1,43 @@ -G:\VS2017\Common7\IDE\VC\VCTargets\Microsoft.CppBuild.targets(377,5): warning MSB8004: Output 目录未以斜杠结尾。 此生成实例将添加斜杠,因为必须有这个斜杠才能正确计算 Output 目录。 +C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets\Microsoft.CppBuild.targets(377,5): warning MSB8004: Output 目录未以斜杠结尾。 此生成实例将添加斜杠,因为必须有这个斜杠才能正确计算 Output 目录。 pch.cpp CcRemote.cpp CcRemoteDlg.cpp -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(162): warning C4996: 'gethostbyname': Use getaddrinfo() or GetAddrInfoW() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(2219): note: 参见“gethostbyname”的声明 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(167): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(308): warning C4244: “初始化”: 从“double”转换到“int”,可能丢失数据 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(325): warning C4244: “初始化”: 从“double”转换到“int”,可能丢失数据 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(797): warning C4018: “<=”: 有符号/无符号不匹配 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(879): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 +f:\myapp\ccremote\ccremote\ccremote\ccremotedlg.cpp(162): warning C4996: 'gethostbyname': Use getaddrinfo() or GetAddrInfoW() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(2219): note: 参见“gethostbyname”的声明 +f:\myapp\ccremote\ccremote\ccremote\ccremotedlg.cpp(167): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 +f:\myapp\ccremote\ccremote\ccremote\ccremotedlg.cpp(308): warning C4244: “初始化”: 从“double”转换到“int”,可能丢失数据 +f:\myapp\ccremote\ccremote\ccremote\ccremotedlg.cpp(325): warning C4244: “初始化”: 从“double”转换到“int”,可能丢失数据 +f:\myapp\ccremote\ccremote\ccremote\ccremotedlg.cpp(797): warning C4018: “<=”: 有符号/无符号不匹配 +f:\myapp\ccremote\ccremote\ccremote\ccremotedlg.cpp(879): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 CScreenSpyDlg.cpp -g:\ccremote\ccremote\ccremote\ccremote\cscreenspydlg.cpp(54): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 +f:\myapp\ccremote\ccremote\ccremote\cscreenspydlg.cpp(54): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 CSettingDlg.cpp CShellDlg.cpp -g:\ccremote\ccremote\ccremote\ccremote\cshelldlg.cpp(95): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 -g:\ccremote\ccremote\ccremote\ccremote\cshelldlg.cpp(122): warning C4018: “<”: 有符号/无符号不匹配 -g:\ccremote\ccremote\ccremote\ccremote\cshelldlg.cpp(208): warning C4018: “<=”: 有符号/无符号不匹配 -g:\ccremote\ccremote\ccremote\ccremote\cshelldlg.cpp(218): warning C4018: “<”: 有符号/无符号不匹配 +f:\myapp\ccremote\ccremote\ccremote\cshelldlg.cpp(95): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 +f:\myapp\ccremote\ccremote\ccremote\cshelldlg.cpp(122): warning C4018: “<”: 有符号/无符号不匹配 +f:\myapp\ccremote\ccremote\ccremote\cshelldlg.cpp(208): warning C4018: “<=”: 有符号/无符号不匹配 +f:\myapp\ccremote\ccremote\ccremote\cshelldlg.cpp(218): warning C4018: “<”: 有符号/无符号不匹配 CSystemDlg.cpp -g:\ccremote\ccremote\ccremote\ccremote\csystemdlg.cpp(114): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 +f:\myapp\ccremote\ccremote\ccremote\csystemdlg.cpp(114): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 CpuUsage.cpp IniFile.cpp -g:\ccremote\ccremote\ccremote\ccremote\inifile.cpp(33): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. - g:\windows kits\10\include\10.0.17763.0\ucrt\string.h(90): note: 参见“strcat”的声明 +f:\myapp\ccremote\ccremote\ccremote\inifile.cpp(33): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. + d:\windows kits\10\include\10.0.17763.0\ucrt\string.h(90): note: 参见“strcat”的声明 SEU_QQwry.cpp TrueColorToolBar.cpp 正在生成代码... Buffer.cpp IOCPServer.cpp -g:\ccremote\ccremote\ccremote\ccremote\include\iocpserver.cpp(133): warning C4996: 'WSASocketA': Use WSASocketW() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(3416): note: 参见“WSASocketA”的声明 -g:\ccremote\ccremote\ccremote\ccremote\include\iocpserver.cpp(720): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings - g:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 -g:\ccremote\ccremote\ccremote\ccremote\include\iocpserver.cpp(769): warning C4244: “初始化”: 从“double”转换到“unsigned long”,可能丢失数据 -g:\ccremote\ccremote\ccremote\ccremote\include\iocpserver.cpp(915): warning C4018: “>=”: 有符号/无符号不匹配 +f:\myapp\ccremote\ccremote\ccremote\include\iocpserver.cpp(133): warning C4996: 'WSASocketA': Use WSASocketW() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(3416): note: 参见“WSASocketA”的声明 +f:\myapp\ccremote\ccremote\ccremote\include\iocpserver.cpp(724): warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprecated API warnings + d:\windows kits\10\include\10.0.17763.0\um\winsock2.h(1849): note: 参见“inet_ntoa”的声明 +f:\myapp\ccremote\ccremote\ccremote\include\iocpserver.cpp(773): warning C4244: “初始化”: 从“double”转换到“unsigned long”,可能丢失数据 +f:\myapp\ccremote\ccremote\ccremote\include\iocpserver.cpp(919): warning C4018: “>=”: 有符号/无符号不匹配 正在生成代码... - CcRemote.vcxproj -> G:\CcRemote\CcRemote\CcRemote\CcRemote\..\..\bin\CcRemote.exe + CcRemote.vcxproj -> F:\myapp\CcRemote\CcRemote\CcRemote\..\..\bin\CcRemote.exe diff --git a/CcRemote/CcRemote/Debug/CcRemote.tlog/CcRemote.lastbuildstate b/CcRemote/CcRemote/Debug/CcRemote.tlog/CcRemote.lastbuildstate index 4f8bf97..c0e4c06 100644 --- a/CcRemote/CcRemote/Debug/CcRemote.tlog/CcRemote.lastbuildstate +++ b/CcRemote/CcRemote/Debug/CcRemote.tlog/CcRemote.lastbuildstate @@ -1,2 +1,2 @@ #TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0.17763.0 -Debug|Win32|G:\CcRemote\CcRemote\CcRemote\| +Debug|Win32|F:\myapp\CcRemote\CcRemote\| diff --git a/CcRemote/CcRemote/Debug/iocpserver.obj.enc b/CcRemote/CcRemote/Debug/iocpserver.obj.enc deleted file mode 100644 index 1b7c0e3..0000000 Binary files a/CcRemote/CcRemote/Debug/iocpserver.obj.enc and /dev/null differ diff --git a/CcRemote/CcRemote/include/IOCPServer.cpp b/CcRemote/CcRemote/include/IOCPServer.cpp index 4ff5b50..240842e 100644 --- a/CcRemote/CcRemote/include/IOCPServer.cpp +++ b/CcRemote/CcRemote/include/IOCPServer.cpp @@ -344,10 +344,11 @@ void CIOCPServer::OnAccept() // Ҫɶ˿ӿͻ˵ ClientContext* pContext = AllocateContext(); + // ʲôҲ // bugע͵ֲôڵWSAIoctlʱַᷢıд쳣 // pContext2pContext2ĵַı䣬pContextûܵӰ // ֻdebugŻ֣֣ӦDZԭɵģջûƽ⵼£² - ClientContext* pContext2 = pContext;//ʲôҲ + ClientContext* pContext2 = pContext; // AllocateContext fail if (pContext == NULL) return; diff --git a/CcRemote/CcRemote/res/201707313609_2683.cur b/CcRemote/CcRemote/res/201707313609_2683.cur new file mode 100644 index 0000000..100a016 Binary files /dev/null and b/CcRemote/CcRemote/res/201707313609_2683.cur differ diff --git a/bin/CcRemote.exe b/bin/CcRemote.exe index 13d4391..88b5678 100644 Binary files a/bin/CcRemote.exe and b/bin/CcRemote.exe differ