diff --git a/CcRemote/.vs/CcRemote/v15/.suo b/CcRemote/.vs/CcRemote/v15/.suo index accacc9..63c8aca 100644 Binary files a/CcRemote/.vs/CcRemote/v15/.suo and b/CcRemote/.vs/CcRemote/v15/.suo differ diff --git a/CcRemote/CcRemote/CcRemote.rc b/CcRemote/CcRemote/CcRemote.rc index 03b3e61..80760ca 100644 Binary files a/CcRemote/CcRemote/CcRemote.rc and b/CcRemote/CcRemote/CcRemote.rc differ diff --git a/CcRemote/CcRemote/CcRemote.vcxproj b/CcRemote/CcRemote/CcRemote.vcxproj index 702f201..e4de496 100644 --- a/CcRemote/CcRemote/CcRemote.vcxproj +++ b/CcRemote/CcRemote/CcRemote.vcxproj @@ -296,6 +296,7 @@ + @@ -303,6 +304,16 @@ + + + + + + + + + + diff --git a/CcRemote/CcRemote/CcRemote.vcxproj.filters b/CcRemote/CcRemote/CcRemote.vcxproj.filters index dec3f70..56105fa 100644 --- a/CcRemote/CcRemote/CcRemote.vcxproj.filters +++ b/CcRemote/CcRemote/CcRemote.vcxproj.filters @@ -242,5 +242,38 @@ 资源文件 + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + + + 资源文件 + \ No newline at end of file diff --git a/CcRemote/CcRemote/CcRemoteDlg.cpp b/CcRemote/CcRemote/CcRemoteDlg.cpp index a8f21e1..15e02a0 100644 --- a/CcRemote/CcRemote/CcRemoteDlg.cpp +++ b/CcRemote/CcRemote/CcRemoteDlg.cpp @@ -387,15 +387,48 @@ int CCcRemoteDlg::InitMyMenu() ::SetMenu(this->GetSafeHwnd(), hmenu); //为窗口设置菜单 ::DrawMenuBar(this->GetSafeHwnd()); //显示菜单 + int enum_ico[] = { IDB_BITMAP_ENUM_SHELL , + IDB_BITMAP_ENUM_PROCESS, + IDB_BITMAP_ENUM_WINDOW, + IDB_BITMAP_ENUM_DESK, + IDB_BITMAP_ENUM_FILE, + IDB_BITMAP_ENUM_AUDIO, + IDB_BITMAP_ENUM_NULL, + IDB_BITMAP_ENUM_SERVICE, + IDB_BITMAP_ENUM_REGIST, + IDB_BITMAP_ENUM_QUIT }; + popup.LoadMenu(IDR_MENU_ONLINE);//载入菜单资源 - //popup.GetSubMenu(0)->SetMenuItemBitmaps(); - ::MENUINFO lpcmi; - m_brush.CreateSolidBrush(RGB(236, 153, 101));//颜色 - memset(&lpcmi, 0, sizeof(::LPCMENUINFO)); - lpcmi.cbSize = sizeof(MENUINFO); - lpcmi.fMask = MIM_APPLYTOSUBMENUS | MIM_BACKGROUND; - lpcmi.hbrBack = (HBRUSH)m_brush.operator HBRUSH(); - ::SetMenuInfo(popup, &lpcmi); + m_IconBitmap.LoadBitmap(IDB_BITMAP_ENUM_REGIST); + CMenu *pSubMenu = popup.GetSubMenu(0);//获得子菜单(如果有)0表示索引,对应“文件”菜单 + for (int i = 0; i < 10; i++) + { + CBitmap bmp; + bmp.LoadBitmap(enum_ico[i]); + pSubMenu->SetMenuItemBitmaps(i, MF_BYPOSITION, &bmp, &bmp); + bmp.Detach(); + } + + CBitmap bmp; + CBrush m_BKBrush; + bmp.LoadBitmap(IDB_BITMAP_LOGO); + m_BKBrush.CreatePatternBrush(&bmp);//创建位图画刷 + MENUINFO mnInfo; + memset(&mnInfo, 0, sizeof(MENUINFO)); + mnInfo.cbSize = sizeof(MENUINFO); + mnInfo.fMask = MIM_BACKGROUND; + mnInfo.hbrBack = m_BKBrush; + ::SetMenuInfo(pSubMenu->m_hMenu, &mnInfo); + m_BKBrush.Detach(); + + + //::MENUINFO lpcmi; + //m_brush.CreateSolidBrush(RGB(236, 153, 101));//颜色 + //memset(&lpcmi, 0, sizeof(::LPCMENUINFO)); + //lpcmi.cbSize = sizeof(MENUINFO); + //lpcmi.fMask = MIM_APPLYTOSUBMENUS | MIM_BACKGROUND; + //lpcmi.hbrBack = (HBRUSH)m_brush.operator HBRUSH(); + //::SetMenuInfo(popup, &lpcmi); return 0; } @@ -1178,6 +1211,13 @@ HBRUSH CCcRemoteDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) sPath.ReleaseBuffer(); // TODO: 如果默认的不是所需画笔,则返回另一个画笔 } + if (nCtlColor == CTLCOLOR_STATIC) + { + pDC->SetTextColor(RGB(255, 255, 255)); + pDC->SetBkMode(TRANSPARENT); //设置背景透明 + return HBRUSH(GetStockObject(HOLLOW_BRUSH)); + + } return hbr; } diff --git a/CcRemote/CcRemote/CcRemoteDlg.h b/CcRemote/CcRemote/CcRemoteDlg.h index 5e7b1b4..032d0e2 100644 --- a/CcRemote/CcRemote/CcRemoteDlg.h +++ b/CcRemote/CcRemote/CcRemoteDlg.h @@ -50,6 +50,7 @@ public: private: //--------------变量及常量---------------- + CBitmap m_IconBitmap; NOTIFYICONDATA nid; // 含有图标 消息响应 的一个结构体 用于系统托盘 CMenu popup; // LIST菜单变量 SEU_QQwry* m_QQwry; // 识别IP区域 diff --git a/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log b/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log index df0deb5..9b9ecf4 100644 --- a/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log +++ b/CcRemote/CcRemote/Debug/CcRemote.Build.CppClean.log @@ -1,34 +1,37 @@ -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\audio.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\truecolortoolbar.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\seu_qqwry.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\regdlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\inputdlg.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\filetransfermodedlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\cserverdlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\cfilemanagerdlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremotedlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\ccremote.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\caudiodlg.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\iocpserver.obj -g:\ccremote\ccremote\ccremote\ccremote\debug\buffer.obj -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\audio.obj +f:\myapp\ccremote\ccremote\ccremote\debug\truecolortoolbar.obj +f:\myapp\ccremote\ccremote\ccremote\debug\seu_qqwry.obj +f:\myapp\ccremote\ccremote\ccremote\debug\regdlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\inputdlg.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\filetransfermodedlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\cserverdlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\cfilemanagerdlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\ccremotedlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\ccremote.obj +f:\myapp\ccremote\ccremote\ccremote\debug\caudiodlg.obj +f:\myapp\ccremote\ccremote\ccremote\debug\iocpserver.obj +f:\myapp\ccremote\ccremote\ccremote\debug\buffer.obj +f:\myapp\ccremote\bin\ccremote.exe +f:\myapp\ccremote\bin\ccremote.ilk +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 9b84644..1de6781 100644 --- a/CcRemote/CcRemote/Debug/CcRemote.log +++ b/CcRemote/CcRemote/Debug/CcRemote.log @@ -1,14 +1,2 @@ -G:\VS2017\Common7\IDE\VC\VCTargets\Microsoft.CppBuild.targets(377,5): warning MSB8004: Output 目录未以斜杠结尾。 此生成实例将添加斜杠,因为必须有这个斜杠才能正确计算 Output 目录。 - CcRemote.cpp - CcRemoteDlg.cpp -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(169): 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(174): 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(333): warning C4244: “初始化”: 从“double”转换到“int”,可能丢失数据 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(353): warning C4244: “初始化”: 从“double”转换到“int”,可能丢失数据 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(857): warning C4018: “<=”: 有符号/无符号不匹配 -g:\ccremote\ccremote\ccremote\ccremote\ccremotedlg.cpp(945): 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”的声明 - 正在生成代码... - CcRemote.vcxproj -> G:\CcRemote\CcRemote\CcRemote\CcRemote\..\..\bin\CcRemote.exe +C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets\Microsoft.CppBuild.targets(377,5): warning MSB8004: Output 目录未以斜杠结尾。 此生成实例将添加斜杠,因为必须有这个斜杠才能正确计算 Output 目录。 + CcRemote.vcxproj -> F:\myapp\CcRemote\CcRemote\CcRemote\..\..\bin\CcRemote.exe diff --git a/CcRemote/CcRemote/Debug/CcRemote.res b/CcRemote/CcRemote/Debug/CcRemote.res index 354afa2..8a2cb12 100644 Binary files a/CcRemote/CcRemote/Debug/CcRemote.res and b/CcRemote/CcRemote/Debug/CcRemote.res differ 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/res/window_ico/IDR_MENU_ONLINE/enum_bmp_audio.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_audio.bmp new file mode 100644 index 0000000..7dac20a Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_audio.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_desk.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_desk.bmp new file mode 100644 index 0000000..2a82783 Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_desk.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_file.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_file.bmp new file mode 100644 index 0000000..f41befd Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_file.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_null.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_null.bmp new file mode 100644 index 0000000..286a5aa Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_null.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_process.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_process.bmp new file mode 100644 index 0000000..cf52c09 Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_process.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_quit.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_quit.bmp new file mode 100644 index 0000000..7af72cf Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_quit.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_regist.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_regist.bmp new file mode 100644 index 0000000..4569eaf Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_regist.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_service.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_service.bmp new file mode 100644 index 0000000..42fdc00 Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_service.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_shell.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_shell.bmp new file mode 100644 index 0000000..ddff7a3 Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_shell.bmp differ diff --git a/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_window.bmp b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_window.bmp new file mode 100644 index 0000000..c5d38c1 Binary files /dev/null and b/CcRemote/CcRemote/res/window_ico/IDR_MENU_ONLINE/enum_bmp_window.bmp differ diff --git a/CcRemote/CcRemote/resource.h b/CcRemote/CcRemote/resource.h index c555b3d..80c5d8e 100644 Binary files a/CcRemote/CcRemote/resource.h and b/CcRemote/CcRemote/resource.h differ diff --git a/bin/CcRemote.exe b/bin/CcRemote.exe index a3da5e5..dc03747 100644 Binary files a/bin/CcRemote.exe and b/bin/CcRemote.exe differ