diff --git a/flamingoclient/Bin/config/flamingo.ini b/flamingoclient/Bin/config/flamingo.ini index 02f8d4c6..ec9caaac 100644 --- a/flamingoclient/Bin/config/flamingo.ini +++ b/flamingoclient/Bin/config/flamingo.ini @@ -1,5 +1,5 @@ [server] -server=192.168.206.151 +server=120.55.94.78 port=20000 fileserver=120.55.94.78 fileport=20001 diff --git a/flamingoclient/Build.bat b/flamingoclient/Build.bat new file mode 100644 index 00000000..ea4041a8 --- /dev/null +++ b/flamingoclient/Build.bat @@ -0,0 +1,4 @@ +mkdir VS2017 +cd VS2017 +cmake .. +MSBuild.exe FlamingGoClient.sln \ No newline at end of file diff --git a/flamingoclient/CMakeLists.txt b/flamingoclient/CMakeLists.txt new file mode 100644 index 00000000..71cd6395 --- /dev/null +++ b/flamingoclient/CMakeLists.txt @@ -0,0 +1,143 @@ +cmake_minimum_required(VERSION 3.0) +project(FlamingGoClient) +include_directories(./Source/wtl9.0/) +include_directories(./Source/) +ADD_DEFINITIONS(-D_AFXDLL) + +# 在共享库中使用MFC +SET(CMAKE_MFC_FLAG 2) +add_link_options("/SUBSYSTEM:WINDOWS") +add_definitions(-D_UNICODE) +add_definitions(-DUNICODE) +link_directories(./Source/lib/) +SET(FLAMING_GO_CLIENT_SOURCE +./Source/AboutDlg.h ./Source/AboutDlg.cpp +./Source/AddFriendConfirmDlg.h ./Source/AddFriendConfirmDlg.cpp +./Source/BuddyChatDlg.h ./Source/BuddyChatDlg.cpp +./Source/BuddyInfoDlg.h ./Source/BuddyInfoDlg.cpp +./Source/BuddyInfoFloatWnd.h ./Source/BuddyInfoFloatWnd.cpp +./Source/BuddyListCtrl.h ./Source/BuddyListCtrl.cpp +#./Source/BuddyListCtrlEx.h ./Source/BuddyListCtrlEx.cpp +./Source/Buffer.h ./Source/Buffer.cpp +./Source/CascadeWinManager.h ./Source/CascadeWinManager.cpp +./Source/ChangePicHead.h ./Source/ChangePicHead.cpp +./Source/ChangePicHeadDlg.h ./Source/ChangePicHeadDlg.cpp +./Source/ChatDlgCommon.h ./Source/ChatDlgCommon.cpp +./Source/ChatTabMgr.h ./Source/ChatTabMgr.cpp +./Source/CheckNetworkStatusTask.h ./Source/CheckNetworkStatusTask.cpp +./Source/ClosePromptDlg.h ./Source/ClosePromptDlg.cpp +./Source/Crash.cpp +./Source/CreateNewGroupDlg.h ./Source/CreateNewGroupDlg.cpp +#./Source/CRegisterSkinHyperLink.h ./Source/CRegisterSkinHyperLink.cpp +./Source/CriticalSection.h ./Source/CriticalSection.cpp +./Source/CriticalSection.h ./Source/ChangePicHeadDlg.cpp +./Source/CustomMsgDef.h +./Source/DstVersion.h +./Source/EncodingUtil.h ./Source/EncodingUtil.cpp +./Source/ChangePicHeadDlg.h ./Source/ChangePicHeadDlg.cpp +./Source/FaceCtrl.h ./Source/FaceCtrl.cpp +./Source/FaceList.h ./Source/FaceList.cpp +./Source/FaceSelDlg.h ./Source/FaceSelDlg.cpp +./Source/File.h ./Source/File.cpp +./Source/File2.h ./Source/File2.cpp +./Source/FileTaskThread.h ./Source/FileTaskThread.cpp +./Source/FileTransferCtrl.h ./Source/FileTransferCtrl.cpp +./Source/FindFriendDlg.h ./Source/FindFriendDlg.cpp +./Source/FlamingoClient.h ./Source/FlamingoClient.cpp +./Source/FontSelDlg.h ./Source/FontSelDlg.cpp +./Source/GDIFactory.h ./Source/GDIFactory.cpp +./Source/GifImage.h ./Source/GifImage.cpp +./Source/GroupChatDlg.h ./Source/GroupChatDlg.cpp +./Source/GroupInfoDlg.h ./Source/GroupInfoDlg.cpp +#./Source/GroupListCtrl.h ./Source/GroupListCtrl.cpp +./Source/HeartbeatTask.h ./Source/HeartbeatTask.cpp +./Source/HideWindow.h ./Source/HideWindow.cpp +./Source/IImageOle.h +./Source/ImageEx.h ./Source/ImageEx.cpp +./Source/ImageTaskThread.h ./Source/ImageTaskThread.cpp +./Source/IniFile.h ./Source/IniFile.cpp +./Source/IULog.h ./Source/IULog.cpp +./Source/LoginAccountList.h ./Source/LoginAccountList.cpp +./Source/LoginDlg.h ./Source/LoginDlg.cpp +./Source/LoginSettingsDlg.h ./Source/LoginSettingsDlg.cpp +./Source/LogonUserInfoDlg.h ./Source/LogonUserInfoDlg.cpp +./Source/MainDlg.h ./Source/MainDlg.cpp +./Source/MD5.h ./Source/MD5.cpp +./Source/MD5Sum.h ./Source/MD5Sum.cpp +./Source/MessageLogger.h ./Source/MessageLogger.cpp +./Source/MiniBuffer.h ./Source/MinuBuffer.cpp +./Source/MobileStatusDlg.h ./Source/MobileStatusDlg.cpp +./Source/ModifyMarkNameDlg.h ./Source/ModifyMarkNameDlg.cpp +./Source/ModifyPasswordDlg.h ./Source/ModifyPasswordDlg.cpp +./Source/MsgTipDlg.h ./Source/MsgTipDlg.cpp +./Source/MultiChatDlg.h ./Source/MultiChatDlg.cpp +./Source/MultiChatMemberSelectionDlg.h ./Source/MultiChatMemberSelectionDlg.cpp +./Source/NetRecvHandleTask.h ./Source/NetRecvHandleTask.cpp +./Source/NetSendTask.h ./Source/NetSendTask.cpp +./Source/Path.h ./Source/Path.cpp +./Source/PerformanceCounter.h ./Source/PerformanceCounter.cpp +./Source/PicBarDlg.h ./Source/PicBarDlg.cpp +./Source/RecentListCtrl.h ./Source/RecentListCtrl.cpp +./Source/RecvMsgThread.h ./Source/RecvMsgThread.cpp +./Source/RegisterDialog.h ./Source/RegisterDialog.cpp +./Source/RemoteDesktopDlg.h ./Source/RemoteDesktopDlg.cpp +./Source/resource.h ./Source/Result.h +./Source/RichEditUtil.h ./Source/RichEditUtil.cpp +./Source/SendMsgThread.h ./Source/SendMsgThread.cpp +./Source/SessChatDlg.h ./Source/SessChatDlg.cpp +./Source/SplitterCtrl.h ./Source/SplitterCtrl.cpp +./Source/SrcVersion.h ./Source/ +./Source/Startup.h ./Source/Startup.cpp +./Source/stdafx.h ./Source/stdafx.cpp +./Source/SystemSettingDlg.h ./Source/SystemSettingDlg.cpp +./Source/TeamDlg.h ./Source/TeamDlg.cpp +./Source/Thread.h ./Source/Thread.cpp +./Source/ThreadPool.h ./Source/ThreadPool.cpp +./Source/UtilTime.h ./Source/UtilTime.cpp +./Source/TrayIcon.h ./Source/TrayIcon.cpp +./Source/UIText.h +./Source/UpdateDlg.h ./Source/UpdateDlg.cpp +./Source/Updater.h ./Source/Updater.cpp +./Source/UserConfig.h ./Source/UserConfig.cpp +./Source/UserMgr.h ./Source/UserMgr.cpp +./Source/UserSessionData.h ./Source/UserSessionData.cpp +./Source/UserSnapInfoDlg.h ./Source/UserSnapInfoDlg.cpp +./Source/Utils.h ./Source/Utils.cpp +./Source/XmlDocument.h ./Source/XmlDocument.cpp +./Source/ZlibUtil.h ./Source/ZlibUtil.cpp +./Source/ ./Source/ +./Source/flamingo.rc) + +SET(NET_SOURCE_FILE ./Source/net/Msg.h ./Source/net/FileMsg.h +./Source/net/IUProtocolData.h ./Source/net/IUProtocolData.cpp +./Source/net/IUSocket.h ./Source/net/IUSocket.cpp +./Source/net/protocolstream.h ./Source/net/protocolstream.cpp +) + + + +SET(REMOTE_DESKTOP_SOURCE_FILE ./Source/RemoteDesktop/CursorInfo.h +./Source/RemoteDesktop/ScreenManager.h +./Source/RemoteDesktop/ScreenManager.cpp +./Source/RemoteDesktop/ScreenSpy.h +./Source/RemoteDesktop/ScreenSpy.cpp +./Source/RemoteDesktop/until.h +./Source/RemoteDesktop/until.cpp) + +add_subdirectory(./Source/jsoncpp-1.9.0) +add_subdirectory(./Source/SkinLib) +add_subdirectory(./Source/zlib1.2.11) +link_libraries(jsoncpp SkinLib zlib RichEd20) +if(CMAKE_CL_64) + #设置64位的程序目标(可执行程序)输出路径 + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_SOURCE_DIR}/bin/Debug64/) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/bin/Release64/) +else() + #设置32位的程序目标(可执行程序)输出路径 + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_SOURCE_DIR}/Bin/) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/Bin/) +endif() +add_executable(flamingGoClient ${FLAMING_GO_CLIENT_SOURCE} ${NET_SOURCE_FILE} ${SKIN_LIB_SOURCE_FILE}) + +add_subdirectory(./CatchScreen) +add_subdirectory(./iAutoUpdate) \ No newline at end of file diff --git a/flamingoclient/CatchScreen/CMakeLists.txt b/flamingoclient/CatchScreen/CMakeLists.txt new file mode 100644 index 00000000..703046bd --- /dev/null +++ b/flamingoclient/CatchScreen/CMakeLists.txt @@ -0,0 +1,36 @@ +cmake_minimum_required(VERSION 3.0) +project(CatchScreen) + +ADD_DEFINITIONS(-D_AFXDLL) + +# 在共享库中使用MFC +SET(CMAKE_MFC_FLAG 2) +add_link_options("/SUBSYSTEM:WINDOWS") +add_definitions(-D_UNICODE) +add_definitions(-DUNICODE) +SET(CATCH_SCREEN_SOURCE_FILE +./CatchScreen.h +./CatchScreen.cpp +CatchScreen.rc +CatchScreenDlg.cpp +CatchScreenDlg.h +EditEx.cpp +EditEx.h +resource.h +StdAfx.cpp +StdAfx.h +TrackerEx.cpp +TrackerEx.h +) + +SET(SOURCE_FILE ./res/arrow_m.cur +./res/back_dd.bmp +./res/back.bmp +./res/CatchScreen.ico +./res/CatchScreen.rc2 +./res/move_r.cur +./res/size1_r.cur +./res/size2_r.cur +./res/size3_r.cur +./res/size4_r.cur) +add_executable(CatchScreen WIN32 ${CATCH_SCREEN_SOURCE_FILE} ${SOURCE_FILE}) \ No newline at end of file diff --git a/flamingoclient/CatchScreen/CatchScreen.rc b/flamingoclient/CatchScreen/CatchScreen.rc index eb177e79..9f3f04c5 100644 --- a/flamingoclient/CatchScreen/CatchScreen.rc +++ b/flamingoclient/CatchScreen/CatchScreen.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// (л񹲺͹) resources +// ����(�л����񹲺͹�) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) #ifdef _WIN32 @@ -76,7 +76,7 @@ IDR_MAINFRAME ICON "res\\CatchScreen.ico" IDD_CATCHSCREEN_DIALOG DIALOGEX 0, 0, 376, 230 STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE EXSTYLE WS_EX_APPWINDOW -FONT 9, "", 0, 0, 0x1 +FONT 9, "����", 0, 0, 0x1 BEGIN EDITTEXT IDC_EDIT1,0,0,375,230,ES_MULTILINE | ES_READONLY | NOT WS_BORDER END @@ -104,12 +104,12 @@ BEGIN BEGIN BLOCK "080404b0" BEGIN - VALUE "FileDescription", "CatchScreen Microsoft Ӧó" + VALUE "FileDescription", "CatchScreen Microsoft ������Ӧ�ó���" VALUE "FileVersion", "1, 0, 0, 1" VALUE "InternalName", "CatchScreen" - VALUE "LegalCopyright", "Ȩ (C) 2006" + VALUE "LegalCopyright", "��Ȩ���� (C) 2006" VALUE "OriginalFilename", "CatchScreen.EXE" - VALUE "ProductName", "CatchScreen Ӧó" + VALUE "ProductName", "CatchScreen Ӧ�ó���" VALUE "ProductVersion", "1, 0, 0, 1" END END @@ -137,8 +137,8 @@ IDC_CURSOR6 CURSOR "res\\size4_r.cur" // Bitmap // -IDB_BITMAP1 BITMAP "res\\back dd.bmp" -#endif // (л񹲺͹) resources +IDB_BITMAP1 BITMAP "res\\back_dd.bmp" +#endif // ����(�л����񹲺͹�) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/flamingoclient/CatchScreen/CatchScreen.vcxproj b/flamingoclient/CatchScreen/CatchScreen.vcxproj deleted file mode 100644 index 537f10ea..00000000 --- a/flamingoclient/CatchScreen/CatchScreen.vcxproj +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {86AA852D-DED5-4D74-B0D5-FF731A7F81C0} - CatchScreen - MFCProj - 10.0 - - - - Application - v142 - Dynamic - Unicode - - - Application - v142 - Dynamic - Unicode - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - ../Bin\ - $(Configuration)\ - false - - - ..\Bin\ - .\debug\ - true - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/CatchScreen.tlb - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - stdafx.h - .\Release/CatchScreen.pch - .\Release/ - .\Release/ - .\Release/ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0804 - - - $(OutDir)$(ProjectName).exe - true - true - $(TargetDir)$(TargetName).pdb - Windows - false - - MachineX86 - - - true - .\Release/CatchScreen.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/CatchScreen.tlb - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\Debug/CatchScreen.pch - .\Debug/ - .\Debug/ - .\Debug/ - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0804 - - - $(OutDir)$(ProjectName).exe - true - true - $(TargetDir)$(TargetName).pdb - Windows - false - - MachineX86 - - - true - .\Debug/CatchScreen.bsc - - - - - - - - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/flamingoclient/CatchScreen/CatchScreen.vcxproj.filters b/flamingoclient/CatchScreen/CatchScreen.vcxproj.filters deleted file mode 100644 index eff6f623..00000000 --- a/flamingoclient/CatchScreen/CatchScreen.vcxproj.filters +++ /dev/null @@ -1,102 +0,0 @@ - - - - - {4ba89acd-7d88-438d-b3e3-a2b517b92001} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {efdc4a7b-e179-4955-ba16-25a9afaf2e71} - h;hpp;hxx;hm;inl - - - {da454d7f-f206-48bc-bdc2-49d3127b5cea} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - - - - \ No newline at end of file diff --git a/flamingoclient/CatchScreen/res/back dd.bmp b/flamingoclient/CatchScreen/res/back_dd.bmp similarity index 100% rename from flamingoclient/CatchScreen/res/back dd.bmp rename to flamingoclient/CatchScreen/res/back_dd.bmp diff --git a/flamingoclient/FlamingoClient.sln b/flamingoclient/FlamingoClient.sln deleted file mode 100644 index 9022870c..00000000 --- a/flamingoclient/FlamingoClient.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.202 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iUpdateAuto", "iAutoUpdate\iUpdateAuto.vcxproj", "{8C607E23-1BFB-4CC8-8A78-C8F773E6D43D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CatchScreen", "CatchScreen\CatchScreen.vcxproj", "{86AA852D-DED5-4D74-B0D5-FF731A7F81C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Flamingo", "Source\Flamingo.vcxproj", "{8FDC31E9-4762-432C-BB7C-B3AF4CF496A2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8C607E23-1BFB-4CC8-8A78-C8F773E6D43D}.Debug|Win32.ActiveCfg = Debug|Win32 - {8C607E23-1BFB-4CC8-8A78-C8F773E6D43D}.Debug|Win32.Build.0 = Debug|Win32 - {8C607E23-1BFB-4CC8-8A78-C8F773E6D43D}.Release|Win32.ActiveCfg = Release|Win32 - {8C607E23-1BFB-4CC8-8A78-C8F773E6D43D}.Release|Win32.Build.0 = Release|Win32 - {86AA852D-DED5-4D74-B0D5-FF731A7F81C0}.Debug|Win32.ActiveCfg = Debug|Win32 - {86AA852D-DED5-4D74-B0D5-FF731A7F81C0}.Debug|Win32.Build.0 = Debug|Win32 - {86AA852D-DED5-4D74-B0D5-FF731A7F81C0}.Release|Win32.ActiveCfg = Release|Win32 - {86AA852D-DED5-4D74-B0D5-FF731A7F81C0}.Release|Win32.Build.0 = Release|Win32 - {8FDC31E9-4762-432C-BB7C-B3AF4CF496A2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8FDC31E9-4762-432C-BB7C-B3AF4CF496A2}.Debug|Win32.Build.0 = Debug|Win32 - {8FDC31E9-4762-432C-BB7C-B3AF4CF496A2}.Release|Win32.ActiveCfg = Release|Win32 - {8FDC31E9-4762-432C-BB7C-B3AF4CF496A2}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DBDD9380-14C8-48F2-B29F-0C006003A6CF} - EndGlobalSection -EndGlobal diff --git a/flamingoclient/Source/BuddyChatDlg.cpp b/flamingoclient/Source/BuddyChatDlg.cpp index 02725104..069b2fb9 100644 --- a/flamingoclient/Source/BuddyChatDlg.cpp +++ b/flamingoclient/Source/BuddyChatDlg.cpp @@ -16,6 +16,8 @@ #include "net/protocolstream.h" #include "net/Msg.h" #include "UIText.h" +#include +#include #define CHAT_BG_IMAGE_NAME _T("BuddyChatDlgBg.png") diff --git a/flamingoclient/Source/Flamingo.vcxproj b/flamingoclient/Source/Flamingo.vcxproj deleted file mode 100644 index 29d0652b..00000000 --- a/flamingoclient/Source/Flamingo.vcxproj +++ /dev/null @@ -1,477 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8FDC31E9-4762-432C-BB7C-B3AF4CF496A2} - MingUTalk - Flamingo - 10.0 - - - - Application - v142 - Unicode - - - Application - v142 - Unicode - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - ..\Bin\ - Debug\ - true - wtl9.0\;$(IncludePath) - ..\Bin\;$(LibraryPath) - - - ..\bin\ - Release\ - false - wtl9.0\;$(IncludePath) - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)MingUTalk.tlb - MingUTalk.h - - MingUTalk_i.c - MingUTalk_p.c - - - Disabled - WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) - false - false - false - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - - - RichEd20.Lib;version.lib;odbc32.lib;odbccp32.lib;IMM32.lib;ws2_32.lib;%(AdditionalDependencies) - ..\Bin\$(ProjectName).exe - true - Windows - MachineX86 - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)MingUTalk.tlb - MingUTalk.h - - MingUTalk_i.c - MingUTalk_p.c - - - /EHsc %(AdditionalOptions) - WIN32;_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions) - - MultiThreaded - Use - Level3 - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - - - riched20.lib;version.lib;odbc32.lib;odbccp32.lib;IMM32.lib;Ws2_32.lib;%(AdditionalDependencies) - ..\Bin\$(ProjectName).exe - true - Windows - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - - - - - - - - - - - false - false - - - - - - - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/flamingoclient/Source/Flamingo.vcxproj.filters b/flamingoclient/Source/Flamingo.vcxproj.filters deleted file mode 100644 index f3f88eb3..00000000 --- a/flamingoclient/Source/Flamingo.vcxproj.filters +++ /dev/null @@ -1,866 +0,0 @@ - - - - - {97956e48-f811-494f-b3a6-d78ebfc5e8da} - cpp;c;cxx;def;odl;idl;hpj;bat;asm - - - {f5fce584-c6ae-46a8-ab4d-0a7853f305d5} - h;hpp;hxx;hm;inl;inc - - - {05e91e06-c603-4830-969f-b16ad0443ecc} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest - - - {a6dfeba9-4778-4911-b052-62b6d6f4becb} - - - {3aadaf93-5798-4d21-8658-b61883bcc1d2} - - - {5857eb0c-c7d4-458d-a39b-9c8beb27b29f} - - - {2f347aab-6a7a-4218-b0ed-b2c155e940d3} - - - {1586951a-712b-4a4a-a721-6e621f9d3d37} - - - {6d66fb56-e28b-4d74-a98b-f1c59c202bc5} - - - {7ca38362-fcba-4a1b-9da3-c131d63f71ff} - - - {8f305d8c-8e77-47bb-bf54-76f0c041b365} - - - {c4c2b734-8fd0-42a6-8982-08f8bb358676} - - - {36daf5c6-5829-400c-bd90-74ada6dad94d} - - - {792883a9-fa67-41ef-94a4-302aba71f1ed} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Tasks - - - Tasks - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - Update - - - UserData - - - Tasks - - - Tasks - - - Tasks - - - Tasks - - - net - - - net - - - net - - - UserData - - - UserData - - - UserData - - - Tasks - - - Tasks - - - SkinLib - - - UI - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Tasks - - - UI - - - Utils - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - Utils - - - RemoteDesktop - - - RemoteDesktop - - - RemoteDesktop - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - - - Tasks - - - Tasks - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - SkinLib - - - FakeData - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - UI - - - Update - - - UserData - - - Tasks - - - Tasks - - - Tasks - - - Tasks - - - net - - - net - - - net - - - net - - - net - - - UserData - - - UserData - - - UserData - - - Tasks - - - Tasks - - - SkinLib - - - UI - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - UI - - - UI - - - Tasks - - - Utils - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - zlib1.2.11 - - - Utils - - - RemoteDesktop - - - RemoteDesktop - - - RemoteDesktop - - - RemoteDesktop - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - jsoncpp-1.9.0 - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - - - Resource Files - - - - - zlib1.2.11 - - - - - jsoncpp-1.9.0 - - - \ No newline at end of file diff --git a/flamingoclient/Source/GroupChatDlg.cpp b/flamingoclient/Source/GroupChatDlg.cpp index ce4f0c0d..42ecf629 100644 --- a/flamingoclient/Source/GroupChatDlg.cpp +++ b/flamingoclient/Source/GroupChatDlg.cpp @@ -2,7 +2,7 @@ #include "GroupChatDlg.h" #include "UserSessionData.h" #include "FlamingoClient.h" -#include "Time.h" +#include "UtilTime.h" #include "ChatDlgCommon.h" #include "GDIFactory.h" #include "IULog.h" diff --git a/flamingoclient/Source/MultiChatDlg.cpp b/flamingoclient/Source/MultiChatDlg.cpp index 4807850f..da4b30f9 100644 --- a/flamingoclient/Source/MultiChatDlg.cpp +++ b/flamingoclient/Source/MultiChatDlg.cpp @@ -2,7 +2,7 @@ #include "MultiChatDlg.h" #include "UserSessionData.h" #include "FlamingoClient.h" -#include "Time.h" +#include "UtilTime.h" #include "ChatDlgCommon.h" #include "GDIFactory.h" #include "IULog.h" diff --git a/flamingoclient/Source/SessChatDlg.cpp b/flamingoclient/Source/SessChatDlg.cpp index a3ea0b36..5d962eee 100644 --- a/flamingoclient/Source/SessChatDlg.cpp +++ b/flamingoclient/Source/SessChatDlg.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "SessChatDlg.h" -#include "Time.h" +#include "UtilTime.h" const long SESSIONCHATDLG_WIDTH = 587; const long SESSIONCHATDLG_HEIGHT = 535; diff --git a/flamingoclient/Source/SkinLib/CMakeLists.txt b/flamingoclient/Source/SkinLib/CMakeLists.txt new file mode 100644 index 00000000..d4a0afd1 --- /dev/null +++ b/flamingoclient/Source/SkinLib/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.0) +project(SkinLib) +include_directories(.) +link_libraries(imm32.lib) +SET(SKIN_LIB_SOURCE_FILE +./SkinButton.h +./SkinButton.cpp +./SkinComboBox.h +./SkinComboBox.cpp +./SkinDialog.h +./SkinDialog.cpp +./SkinEdit.h +./SkinEdit.cpp +./SkinHyperLink.h +./SkinHyperLink.cpp +./SkinLib.h +./SkinListCtrl.h +./SkinListCtrl.cpp +./SkinManager.h +./SkinManager.cpp +./SkinMenu.h +./SkinMenu.cpp +./SkinMessageBox.h +./SkinMessageBox.cpp +./SkinPictureBox.h +./SkinPictureBox.cpp +./SkinRichEdit.h +./SkinRichEdit.cpp +./SkinScrollBar.h +./SkinScrollBar.cpp +./SkinStatic.h +./SkinStatic.cpp +./SkinTabCtrl.h +./SkinTabCtrl.cpp +./SkinToolBar.h +./SkinToolBar.cpp +./SkinWebBrowser.h +./SkinWebBrowser.cpp) +add_library(SkinLib ${SKIN_LIB_SOURCE_FILE}) \ No newline at end of file diff --git a/flamingoclient/Source/Time.cpp b/flamingoclient/Source/UtilTime.cpp similarity index 100% rename from flamingoclient/Source/Time.cpp rename to flamingoclient/Source/UtilTime.cpp diff --git a/flamingoclient/Source/Time.h b/flamingoclient/Source/UtilTime.h similarity index 100% rename from flamingoclient/Source/Time.h rename to flamingoclient/Source/UtilTime.h diff --git a/flamingoclient/Source/XmlDocument.h b/flamingoclient/Source/XmlDocument.h index df8f7b9a..d1dac857 100644 --- a/flamingoclient/Source/XmlDocument.h +++ b/flamingoclient/Source/XmlDocument.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _XML_DOCUMENT_H_ +#define _XML_DOCUMENT_H_ #import "msxml3.dll" #include @@ -71,3 +72,4 @@ class CXmlDocument private: IXMLDOMDocument2* m_pXMLDoc; }; +#endif \ No newline at end of file diff --git a/flamingoclient/Source/jsoncpp-1.9.0/CMakeLists.txt b/flamingoclient/Source/jsoncpp-1.9.0/CMakeLists.txt new file mode 100644 index 00000000..bef3dab4 --- /dev/null +++ b/flamingoclient/Source/jsoncpp-1.9.0/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 3.0) +project(jsoncpp-1.9.0) +include_directories(.) +SET(JSON_CPP_SOURCE_FILE ./json_reader.cpp ./json_writer.cpp ./json_value.cpp) +add_library(jsoncpp ${JSON_CPP_SOURCE_FILE}) \ No newline at end of file diff --git a/flamingoclient/Source/RichEd20.Lib b/flamingoclient/Source/lib/RichEd20.Lib similarity index 100% rename from flamingoclient/Source/RichEd20.Lib rename to flamingoclient/Source/lib/RichEd20.Lib diff --git a/flamingoclient/Source/sqlite3.lib b/flamingoclient/Source/lib/sqlite3.lib similarity index 100% rename from flamingoclient/Source/sqlite3.lib rename to flamingoclient/Source/lib/sqlite3.lib diff --git a/flamingoclient/Source/stdafx.h b/flamingoclient/Source/stdafx.h index 37fb4e4c..9026c390 100644 --- a/flamingoclient/Source/stdafx.h +++ b/flamingoclient/Source/stdafx.h @@ -34,6 +34,7 @@ #include #include // WTLʵù #include "resource.h" +#include #if defined _M_IX86 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") diff --git a/flamingoclient/Source/zlib1.2.11/CMakeLists.txt b/flamingoclient/Source/zlib1.2.11/CMakeLists.txt new file mode 100644 index 00000000..0dc7b5d5 --- /dev/null +++ b/flamingoclient/Source/zlib1.2.11/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 3.0) +project(zlib) +include_directories(.) +SET(ZLIB_SOURCE_FILE adler32.c +CMakeLists.txt +compress.c +crc32.c +crc32.h +deflate.c +deflate.h +gzclose.c +gzguts.h +gzlib.c +gzread.c +gzwrite.c +infback.c +inffast.c +inffast.h +inffixed.h +inflate.c +inflate.h +inftrees.c +inftrees.h +trees.c +trees.h +uncompr.c +zconf.h +zlib.h +zlibdemo.c +zutil.c +zutil.h) +add_library(zlib ${ZLIB_SOURCE_FILE}) \ No newline at end of file diff --git a/flamingoclient/iAutoUpdate/CMakeLists.txt b/flamingoclient/iAutoUpdate/CMakeLists.txt new file mode 100644 index 00000000..a90597ea --- /dev/null +++ b/flamingoclient/iAutoUpdate/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.0) +project(iAutoUpdate) +SET(AUTO_UPDATE_SOURCE_FILE ./iUpdateAuto.cpp +./resource.h +./unzip.h +./unzip.cpp +./wlconfig.h +./zwldef.h) + +add_link_options("/SUBSYSTEM:WINDOWS") +SET(AUTO_UPDATE_RESOURCE_FILE ./iUpdateAuto.rc) +if(CMAKE_CL_64) + #设置64位的程序目标(可执行程序)输出路径 + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_SOURCE_DIR}/../bin/Debug64/) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/../bin/Release64/) +else() + #设置32位的程序目标(可执行程序)输出路径 + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_SOURCE_DIR}/../Bin/) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_SOURCE_DIR}/../Bin/) +endif() + +#设置可执行程序的文件名，注意此处有WIN32表示是一个Win32的GUI程序 +add_executable(iAutoUpdate WIN32 ${AUTO_UPDATE_SOURCE_FILE} ${AUTO_UPDATE_RESOURCE_FILE}) \ No newline at end of file diff --git a/flamingoclient/iAutoUpdate/iUpdateAuto.vcxproj b/flamingoclient/iAutoUpdate/iUpdateAuto.vcxproj deleted file mode 100644 index e1d7d1fc..00000000 --- a/flamingoclient/iAutoUpdate/iUpdateAuto.vcxproj +++ /dev/null @@ -1,107 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8C607E23-1BFB-4CC8-8A78-C8F773E6D43D} - iUpdateAuto - Win32Proj - 10.0 - - - - Application - v142 - Unicode - true - - - Application - v142 - Unicode - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - ..\Bin\ - .\debug\ - true - - - ../Bin\ - $(Configuration)\ - false - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) - - - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - - ..\Bin\$(ProjectName).exe - true - Windows - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - - - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/flamingoclient/iAutoUpdate/iUpdateAuto.vcxproj.filters b/flamingoclient/iAutoUpdate/iUpdateAuto.vcxproj.filters deleted file mode 100644 index 6a125d65..00000000 --- a/flamingoclient/iAutoUpdate/iUpdateAuto.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - 源文件 - - - 源文件 - - - - - 头文件 - - - 头文件 - - - 头文件 - - - - - 资源文件 - - - \ No newline at end of file