From a00df015c7408935b9edf33da47cdd9c89f50de7 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 2 May 2015 18:11:42 +0000 Subject: Dropbox and Proto_Dropbox - unified projects git-svn-id: http://svn.miranda-ng.org/main/trunk@13384 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin10/mir_icons.sln | 10 + bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- bin12/mir_icons.sln | 10 + plugins/Dropbox/Dropbox.vcxproj | 33 ++++ plugins/Dropbox/Dropbox.vcxproj.filters | 4 + plugins/Dropbox/Dropbox_10.vcxproj | 218 -------------------- plugins/Dropbox/Dropbox_10.vcxproj.filters | 82 -------- plugins/Dropbox/Dropbox_12.vcxproj | 220 --------------------- plugins/Dropbox/Dropbox_12.vcxproj.filters | 82 -------- .../Dropbox/proto_dropbox/Proto_Dropbox.vcxproj | 28 +++ .../proto_dropbox/Proto_Dropbox.vcxproj.filters | 14 ++ .../Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj | 131 ------------ .../proto_dropbox/Proto_Dropbox_10.vcxproj.filters | 23 --- .../Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj | 135 ------------- .../proto_dropbox/Proto_Dropbox_12.vcxproj.filters | 23 --- plugins/Dropbox/src/common.h | 42 ---- plugins/Dropbox/src/dropbox.cpp | 2 +- plugins/Dropbox/src/dropbox_commands.cpp | 2 +- plugins/Dropbox/src/dropbox_dialogs.cpp | 2 +- plugins/Dropbox/src/dropbox_events.cpp | 2 +- plugins/Dropbox/src/dropbox_icons.cpp | 2 +- plugins/Dropbox/src/dropbox_menus.cpp | 2 +- plugins/Dropbox/src/dropbox_services.cpp | 2 +- plugins/Dropbox/src/dropbox_transfers.cpp | 2 +- plugins/Dropbox/src/dropbox_utils.cpp | 2 +- plugins/Dropbox/src/file_transfer.h | 2 +- plugins/Dropbox/src/http_request.h | 2 +- plugins/Dropbox/src/main.cpp | 49 +++++ plugins/Dropbox/src/stdafx.cpp | 49 ----- plugins/Dropbox/src/stdafx.cxx | 18 ++ plugins/Dropbox/src/stdafx.h | 42 ++++ 35 files changed, 224 insertions(+), 1021 deletions(-) create mode 100644 plugins/Dropbox/Dropbox.vcxproj create mode 100644 plugins/Dropbox/Dropbox.vcxproj.filters delete mode 100644 plugins/Dropbox/Dropbox_10.vcxproj delete mode 100644 plugins/Dropbox/Dropbox_10.vcxproj.filters delete mode 100644 plugins/Dropbox/Dropbox_12.vcxproj delete mode 100644 plugins/Dropbox/Dropbox_12.vcxproj.filters create mode 100644 plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj create mode 100644 plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj.filters delete mode 100644 plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj delete mode 100644 plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj.filters delete mode 100644 plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj delete mode 100644 plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj.filters delete mode 100644 plugins/Dropbox/src/common.h create mode 100644 plugins/Dropbox/src/main.cpp delete mode 100644 plugins/Dropbox/src/stdafx.cpp create mode 100644 plugins/Dropbox/src/stdafx.cxx create mode 100644 plugins/Dropbox/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index cec3d393e8..dc02e2b5ee 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -397,7 +397,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\Ne EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryStats", "..\plugins\HistoryStats\historystats.vcxproj", "{B5BCDC2F-81FC-4324-90C6-E5540A225EFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox_10.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sametime\sametime_10.vcxproj", "{BE22A21F-73B7-453F-86A0-B867F0056490}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 585f241f52..d4dca06b8e 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -397,7 +397,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\Ne EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryStats", "..\plugins\HistoryStats\historystats.vcxproj", "{B5BCDC2F-81FC-4324-90C6-E5540A225EFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox_10.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sametime\sametime_10.vcxproj", "{BE22A21F-73B7-453F-86A0-B867F0056490}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 7fea508a4e..07372125f4 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -431,7 +431,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\Ne EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryStats", "..\plugins\HistoryStats\historystats.vcxproj", "{B5BCDC2F-81FC-4324-90C6-E5540A225EFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox_10.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sametime\sametime_10.vcxproj", "{BE22A21F-73B7-453F-86A0-B867F0056490}" EndProject diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln index 99bca1bc0f..5fc43baab3 100644 --- a/bin10/mir_icons.sln +++ b/bin10/mir_icons.sln @@ -76,6 +76,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Dummy", "..\protocols EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Steam", "..\protocols\Steam\proto_steam\Proto_Steam.vcxproj", "{523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Dropbox", "..\plugins\Dropbox\proto_dropbox\Proto_Dropbox.vcxproj", "{16D1337A-C442-4D3E-857C-E0269BA1CCF0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -388,6 +390,14 @@ Global {523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}.Release|Win32.Build.0 = Release|Win32 {523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}.Release|x64.ActiveCfg = Release|x64 {523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}.Release|x64.Build.0 = Release|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|Win32.Build.0 = Debug|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|x64.ActiveCfg = Debug|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|x64.Build.0 = Debug|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|Win32.ActiveCfg = Release|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|Win32.Build.0 = Release|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|x64.ActiveCfg = Release|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index 5f8fc218dc..5d2b5c616c 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -399,7 +399,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\Ne EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryStats", "..\plugins\HistoryStats\historystats.vcxproj", "{B5BCDC2F-81FC-4324-90C6-E5540A225EFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox_12.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sametime\sametime_12.vcxproj", "{BE22A21F-73B7-453F-86A0-B867F0056490}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index f4d3e529b0..51c0106c9f 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -399,7 +399,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\Ne EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryStats", "..\plugins\HistoryStats\historystats.vcxproj", "{B5BCDC2F-81FC-4324-90C6-E5540A225EFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox_12.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropbox\Dropbox.vcxproj", "{CBA58126-3E02-4159-9BD3-059AF9DBC84E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sametime\sametime_12.vcxproj", "{BE22A21F-73B7-453F-86A0-B867F0056490}" EndProject diff --git a/bin12/mir_icons.sln b/bin12/mir_icons.sln index 0e3102fd9a..e2d5ce1ab2 100644 --- a/bin12/mir_icons.sln +++ b/bin12/mir_icons.sln @@ -78,6 +78,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Dummy", "..\protocols EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Steam", "..\protocols\Steam\proto_steam\Proto_Steam.vcxproj", "{523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Dropbox", "..\plugins\Dropbox\proto_dropbox\Proto_Dropbox.vcxproj", "{16D1337A-C442-4D3E-857C-E0269BA1CCF0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -390,6 +392,14 @@ Global {523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}.Release|Win32.Build.0 = Release|Win32 {523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}.Release|x64.ActiveCfg = Release|x64 {523D76E4-1AB3-49B6-AFF0-E6057FAB9BC0}.Release|x64.Build.0 = Release|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|Win32.Build.0 = Debug|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|x64.ActiveCfg = Debug|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Debug|x64.Build.0 = Debug|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|Win32.ActiveCfg = Release|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|Win32.Build.0 = Release|Win32 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|x64.ActiveCfg = Release|x64 + {16D1337A-C442-4D3E-857C-E0269BA1CCF0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/plugins/Dropbox/Dropbox.vcxproj b/plugins/Dropbox/Dropbox.vcxproj new file mode 100644 index 0000000000..437985989b --- /dev/null +++ b/plugins/Dropbox/Dropbox.vcxproj @@ -0,0 +1,33 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Dropbox + {CBA58126-3E02-4159-9BD3-059AF9DBC84E} + + + + + + + comctl32.lib;shlwapi.lib;%(AdditionalDependencies) + + + \ No newline at end of file diff --git a/plugins/Dropbox/Dropbox.vcxproj.filters b/plugins/Dropbox/Dropbox.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/Dropbox/Dropbox.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/Dropbox/Dropbox_10.vcxproj b/plugins/Dropbox/Dropbox_10.vcxproj deleted file mode 100644 index 8ae3165ecb..0000000000 --- a/plugins/Dropbox/Dropbox_10.vcxproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CBA58126-3E02-4159-9BD3-059AF9DBC84E} - Dropbox - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Level3 - Disabled - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - false - true - 4996;%(DisableSpecificWarnings) - MultiThreadedDebugDLL - Use - common.h - - - Windows - true - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Level3 - Disabled - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - false - true - 4996;%(DisableSpecificWarnings) - MultiThreadedDebugDLL - Use - common.h - - - Windows - true - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Level3 - Full - true - true - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - Use - common.h - Size - - - Windows - true - true - true - false - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - /PDBALTPATH:%_PDB% %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Level3 - Full - true - true - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - Use - common.h - Size - - - Windows - true - true - true - false - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - /PDBALTPATH:%_PDB% %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Dropbox/Dropbox_10.vcxproj.filters b/plugins/Dropbox/Dropbox_10.vcxproj.filters deleted file mode 100644 index 537fc57e9f..0000000000 --- a/plugins/Dropbox/Dropbox_10.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {bb96e6a3-2d56-4aed-9352-30558014561b} - - - {007efe6e-3f6a-49d0-be83-77c03481c085} - - - {badc339a-531c-4f2a-8a2e-e46bd5630044} - - - {bcf6c793-f4ae-4c61-be3c-1ad015244533} - - - - - Resource Files - - - Resource Files - - - - - Resource Files\Icons - - - \ No newline at end of file diff --git a/plugins/Dropbox/Dropbox_12.vcxproj b/plugins/Dropbox/Dropbox_12.vcxproj deleted file mode 100644 index d55a10959a..0000000000 --- a/plugins/Dropbox/Dropbox_12.vcxproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CBA58126-3E02-4159-9BD3-059AF9DBC84E} - Dropbox - - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - false - true - Unicode - v120_xp - - - DynamicLibrary - false - true - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Level4 - Disabled - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - false - true - 4996;%(DisableSpecificWarnings) - MultiThreadedDebugDLL - common.h - Use - - - Windows - true - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Level4 - Disabled - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - false - true - 4996;%(DisableSpecificWarnings) - MultiThreadedDebugDLL - Use - common.h - - - Windows - true - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Level4 - Full - true - true - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - Use - common.h - Size - - - Windows - true - true - true - false - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Level4 - Full - true - true - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - Use - common.h - Size - - - Windows - true - true - true - false - comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Dropbox/Dropbox_12.vcxproj.filters b/plugins/Dropbox/Dropbox_12.vcxproj.filters deleted file mode 100644 index 8384591e36..0000000000 --- a/plugins/Dropbox/Dropbox_12.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {bb96e6a3-2d56-4aed-9352-30558014561b} - - - {007efe6e-3f6a-49d0-be83-77c03481c085} - - - {badc339a-531c-4f2a-8a2e-e46bd5630044} - - - {bcf6c793-f4ae-4c61-be3c-1ad015244533} - - - - - Resource Files - - - Resource Files - - - - - Resource Files\Icons - - - \ No newline at end of file diff --git a/plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj b/plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj new file mode 100644 index 0000000000..cb1d058dc4 --- /dev/null +++ b/plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Proto_Dropbox + {16D1337A-C442-4D3E-857C-E0269BA1CCF0} + + + + + \ No newline at end of file diff --git a/plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj.filters b/plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj.filters new file mode 100644 index 0000000000..5281577ba8 --- /dev/null +++ b/plugins/Dropbox/proto_dropbox/Proto_Dropbox.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj b/plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj deleted file mode 100644 index 42573d7fc5..0000000000 --- a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B97882DC-7462-41DB-A390-BDFCE5295265} - Proto_Dropbox - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj.filters b/plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj.filters deleted file mode 100644 index 38ad0a851e..0000000000 --- a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_10.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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;mfcribbon-ms - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj b/plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj deleted file mode 100644 index 6baa7a0c83..0000000000 --- a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B97882DC-7462-41DB-A390-BDFCE5295265} - Proto_Dropbox - - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - false - Unicode - v120_xp - - - DynamicLibrary - false - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj.filters b/plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj.filters deleted file mode 100644 index 38ad0a851e..0000000000 --- a/plugins/Dropbox/proto_dropbox/Proto_Dropbox_12.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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;mfcribbon-ms - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Dropbox/src/common.h b/plugins/Dropbox/src/common.h deleted file mode 100644 index c34bab3d16..0000000000 --- a/plugins/Dropbox/src/common.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef _COMMON_H_ -#define _COMMON_H_ - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -#include - -#include "version.h" -#include "resource.h" - -#define MODULE "Dropbox" - -extern HINSTANCE g_hInstance; - -class CDropbox; - -#include "dropbox.h" - -#endif //_COMMON_H_ \ No newline at end of file diff --git a/plugins/Dropbox/src/dropbox.cpp b/plugins/Dropbox/src/dropbox.cpp index 7487fab330..98e37451f7 100644 --- a/plugins/Dropbox/src/dropbox.cpp +++ b/plugins/Dropbox/src/dropbox.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" CDropbox::CDropbox() { diff --git a/plugins/Dropbox/src/dropbox_commands.cpp b/plugins/Dropbox/src/dropbox_commands.cpp index e83988ff0c..52422ea779 100644 --- a/plugins/Dropbox/src/dropbox_commands.cpp +++ b/plugins/Dropbox/src/dropbox_commands.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" void CDropbox::CommandHelp(void *arg) { diff --git a/plugins/Dropbox/src/dropbox_dialogs.cpp b/plugins/Dropbox/src/dropbox_dialogs.cpp index 6cb5d9bbf3..a57afbae5b 100644 --- a/plugins/Dropbox/src/dropbox_dialogs.cpp +++ b/plugins/Dropbox/src/dropbox_dialogs.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" INT_PTR CALLBACK CDropbox::MainOptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/Dropbox/src/dropbox_events.cpp b/plugins/Dropbox/src/dropbox_events.cpp index d361f07d28..1d2c2f53e9 100644 --- a/plugins/Dropbox/src/dropbox_events.cpp +++ b/plugins/Dropbox/src/dropbox_events.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" int CDropbox::OnModulesLoaded(void *obj, WPARAM, LPARAM) { diff --git a/plugins/Dropbox/src/dropbox_icons.cpp b/plugins/Dropbox/src/dropbox_icons.cpp index d3bded41f7..97bb2e4884 100644 --- a/plugins/Dropbox/src/dropbox_icons.cpp +++ b/plugins/Dropbox/src/dropbox_icons.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" void CDropbox::InitializeIcons() { diff --git a/plugins/Dropbox/src/dropbox_menus.cpp b/plugins/Dropbox/src/dropbox_menus.cpp index fe1200fc29..3130555d3d 100644 --- a/plugins/Dropbox/src/dropbox_menus.cpp +++ b/plugins/Dropbox/src/dropbox_menus.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" INT_PTR CDropbox::SendFilesToDropboxCommand(void *obj, WPARAM hContact, LPARAM) { diff --git a/plugins/Dropbox/src/dropbox_services.cpp b/plugins/Dropbox/src/dropbox_services.cpp index 270b129d50..c1bce181d0 100644 --- a/plugins/Dropbox/src/dropbox_services.cpp +++ b/plugins/Dropbox/src/dropbox_services.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" int g_nStatus = ID_STATUS_OFFLINE; diff --git a/plugins/Dropbox/src/dropbox_transfers.cpp b/plugins/Dropbox/src/dropbox_transfers.cpp index 52ce2aed57..760e761ebe 100644 --- a/plugins/Dropbox/src/dropbox_transfers.cpp +++ b/plugins/Dropbox/src/dropbox_transfers.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" int CDropbox::SendFile(const char *fileName, const char *data, int length) { diff --git a/plugins/Dropbox/src/dropbox_utils.cpp b/plugins/Dropbox/src/dropbox_utils.cpp index 925d157dfd..ba7fec2ee4 100644 --- a/plugins/Dropbox/src/dropbox_utils.cpp +++ b/plugins/Dropbox/src/dropbox_utils.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" wchar_t *CDropbox::HttpStatusToText(HTTP_STATUS status) { diff --git a/plugins/Dropbox/src/file_transfer.h b/plugins/Dropbox/src/file_transfer.h index 7558b83eba..f214ede484 100644 --- a/plugins/Dropbox/src/file_transfer.h +++ b/plugins/Dropbox/src/file_transfer.h @@ -1,7 +1,7 @@ #ifndef _FILE_TRANSFER_H_ #define _FILE_TRANSFER_H_ -#include "common.h" +#include "stdafx.h" struct FileTransferParam { diff --git a/plugins/Dropbox/src/http_request.h b/plugins/Dropbox/src/http_request.h index 162af8c838..231efbae25 100644 --- a/plugins/Dropbox/src/http_request.h +++ b/plugins/Dropbox/src/http_request.h @@ -1,7 +1,7 @@ #ifndef _HTTP_REQUEST_H_ #define _HTTP_REQUEST_H_ -#include "common.h" +#include "stdafx.h" enum HTTP_STATUS { diff --git a/plugins/Dropbox/src/main.cpp b/plugins/Dropbox/src/main.cpp new file mode 100644 index 0000000000..590b9802c4 --- /dev/null +++ b/plugins/Dropbox/src/main.cpp @@ -0,0 +1,49 @@ +#include "stdafx.h" + +int hLangpack; +CDropbox *dropbox; +HINSTANCE g_hInstance; + +PLUGININFOEX pluginInfo = +{ + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {B908773A-86F7-4A91-8674-6A20BA0E67D1} + {0xb908773a, 0x86f7, 0x4a91, {0x86, 0x74, 0x6a, 0x20, 0xba, 0xe, 0x67, 0xd1}} + +}; + +DWORD WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID) +{ + g_hInstance = hInstance; + + return TRUE; +} + +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) +{ + return &pluginInfo; +} + +extern "C" int __declspec(dllexport) Load(void) +{ + mir_getLP(&pluginInfo); + + dropbox = new CDropbox(); + + return 0; +} + +extern "C" int __declspec(dllexport) Unload(void) +{ + delete dropbox; + + return 0; +} \ No newline at end of file diff --git a/plugins/Dropbox/src/stdafx.cpp b/plugins/Dropbox/src/stdafx.cpp deleted file mode 100644 index 4f582768a9..0000000000 --- a/plugins/Dropbox/src/stdafx.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "common.h" - -int hLangpack; -CDropbox *dropbox; -HINSTANCE g_hInstance; - -PLUGININFOEX pluginInfo = -{ - sizeof(PLUGININFOEX), - __PLUGIN_NAME, - PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), - __DESCRIPTION, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, - // {B908773A-86F7-4A91-8674-6A20BA0E67D1} - {0xb908773a, 0x86f7, 0x4a91, {0x86, 0x74, 0x6a, 0x20, 0xba, 0xe, 0x67, 0xd1}} - -}; - -DWORD WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID) -{ - g_hInstance = hInstance; - - return TRUE; -} - -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfo; -} - -extern "C" int __declspec(dllexport) Load(void) -{ - mir_getLP(&pluginInfo); - - dropbox = new CDropbox(); - - return 0; -} - -extern "C" int __declspec(dllexport) Unload(void) -{ - delete dropbox; - - return 0; -} \ No newline at end of file diff --git a/plugins/Dropbox/src/stdafx.cxx b/plugins/Dropbox/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Dropbox/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/Dropbox/src/stdafx.h b/plugins/Dropbox/src/stdafx.h new file mode 100644 index 0000000000..c34bab3d16 --- /dev/null +++ b/plugins/Dropbox/src/stdafx.h @@ -0,0 +1,42 @@ +#ifndef _COMMON_H_ +#define _COMMON_H_ + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include + +#include "version.h" +#include "resource.h" + +#define MODULE "Dropbox" + +extern HINSTANCE g_hInstance; + +class CDropbox; + +#include "dropbox.h" + +#endif //_COMMON_H_ \ No newline at end of file -- cgit v1.2.3