diff --git a/.gitignore b/.gitignore index 30317047..81bb7f32 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ urbackupserver/www/templates.js.new clientctl/Release/* urbackup/UrBackupUpdate.sig2 backup_scripts/* +.vs/UrBackupBackend/v14/.suo diff --git a/CompiledServer.vcxproj b/CompiledServer.vcxproj index 566ca8e2..b7aca847 100644 --- a/CompiledServer.vcxproj +++ b/CompiledServer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -37,29 +37,35 @@ Application Unicode true + v140 Application Unicode true + v140 Application Unicode + v140 Application Unicode true + v140 Application Unicode true + v140 Application Unicode + v140 @@ -125,7 +131,7 @@ Disabled - ./libfastcgi_win;D:\boost;%(AdditionalIncludeDirectories) + ./libfastcgi_win;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) true EnableFastChecks @@ -153,7 +159,7 @@ Disabled - D:\boost;./libfastcgi;%(AdditionalIncludeDirectories) + ./libfastcgi;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) true EnableFastChecks @@ -177,7 +183,7 @@ - D:\boost;./libfastcgi_win;%(AdditionalIncludeDirectories) + ./libfastcgi_win;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) MultiThreadedDLL @@ -203,7 +209,7 @@ X64 - D:\boost;./libfastcgi_win;%(AdditionalIncludeDirectories) + ./libfastcgi_win;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) MultiThreadedDLL @@ -226,7 +232,7 @@ - D:\boost;./libfastcgi_win;%(AdditionalIncludeDirectories) + ./libfastcgi_win;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;AS_SERVICE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) MultiThreadedDLL @@ -252,8 +258,8 @@ X64 - D:\boost;./libfastcgi_win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;AS_SERVICE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) + ./libfastcgi_win;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;AS_SERVICE;SQLITE_ENABLE_UNLOCK_NOTIFY;%(PreprocessorDefinitions) MultiThreadedDLL @@ -276,7 +282,7 @@ - + @@ -294,7 +300,7 @@ - + @@ -305,7 +311,7 @@ - + @@ -322,7 +328,7 @@ - + @@ -342,7 +348,7 @@ - + @@ -352,7 +358,7 @@ - + diff --git a/CompiledServer.vcxproj.filters b/CompiledServer.vcxproj.filters index 6ba17f36..b6a59217 100644 --- a/CompiledServer.vcxproj.filters +++ b/CompiledServer.vcxproj.filters @@ -33,9 +33,6 @@ Source Files - - Source Files - Source Files @@ -81,9 +78,6 @@ Source Files - - Source Files - Source Files @@ -153,10 +147,16 @@ Source Files - + Source Files - + + Source Files + + + Source Files + + Source Files @@ -167,9 +167,6 @@ Header Files - - Header Files - Header Files @@ -206,9 +203,6 @@ Header Files - - Header Files - Header Files @@ -365,14 +359,20 @@ Interface - - Source Files - Interface Header Files + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/CompiledServerVS12.vcxproj b/CompiledServerVS12.vcxproj deleted file mode 100644 index 2d26742c..00000000 --- a/CompiledServerVS12.vcxproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release Service - Win32 - - - Release Service - x64 - - - Release - Win32 - - - Release - x64 - - - - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9} - CompiledServer - Win32Proj - Server - - - - Application - Unicode - true - v120 - - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - Application - Unicode - true - v120 - - - Application - Unicode - true - v120 - - - Application - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - $(BoostIncludeDir);./libfastcgi_win;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4005;%(DisableSpecificWarnings) - - - $(BoostLibDir);%(AdditionalLibraryDirectories) - true - Console - false - - - MachineX86 - Dbghelp.lib;%(AdditionalDependencies) - - - - - X64 - - - Disabled - $(BoostIncludeDir);./libfastcgi;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - 4005;%(DisableSpecificWarnings) - - - $(BoostLibDir);%(AdditionalLibraryDirectories) - true - Console - false - - - MachineX64 - Dbghelp.lib;%(AdditionalDependencies) - - - - - $(BoostIncludeDir);./libfastcgi_win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - $(BoostLibDir);%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - Dbghelp.lib;%(AdditionalDependencies) - - - - - X64 - - - $(BoostIncludeDir);./libfastcgi;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - true - Console - true - true - false - - - MachineX64 - $(BoostLibDir);%(AdditionalLibraryDirectories) - Dbghelp.lib;%(AdditionalDependencies) - - - - - $(BoostIncludeDir);./libfastcgi_win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;AS_SERVICE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - $(BoostLibDir);%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - Dbghelp.lib;%(AdditionalDependencies) - - - - - X64 - - - $(BoostIncludeDir);./libfastcgi_win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;AS_SERVICE;SQLITE_ENABLE_UNLOCK_NOTIFY;THREAD_BOOST;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - $(BoostLibDir);%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX64 - Dbghelp.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CompiledServerVS12.vcxproj.filters b/CompiledServerVS12.vcxproj.filters deleted file mode 100644 index 17676ca1..00000000 --- a/CompiledServerVS12.vcxproj.filters +++ /dev/null @@ -1,363 +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 - - - {dbe5d795-4050-4d15-823d-60fdb163a210} - - - {ee9dafbd-6268-4f17-b4fc-c50aa8ad1f78} - - - {b763e0d2-04f4-461a-92d0-01ae72cb1aaf} - - - {7a557854-2437-489d-b88e-d49cd2e7bbda} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - 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 - - - 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 - - - fastcgi - - - win_service - - - sqlite - - - Source Files - - - sqlite - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - Interface - - - fastcgi - - - win_service - - - win_service - - - sqlite - - - Interface - - - Interface - - - Header Files - - - sqlite - - - Header Files - - - Interface - - - Header Files - - - Header Files - - - Interface - - - \ No newline at end of file diff --git a/Condition_boost.h b/Condition_boost.h deleted file mode 100644 index 08953e57..00000000 --- a/Condition_boost.h +++ /dev/null @@ -1,18 +0,0 @@ -#include "Interface/Condition.h" - -#include -#include - -class CCondition : public ICondition -{ -public: - CCondition(void){} - virtual void wait(IScopedLock *lock, int timems=-1); - virtual void notify_one(void); - virtual void notify_all(void); - - static boost::xtime getWaitTime(int timeoutms); - -private: - boost::condition cond; -}; \ No newline at end of file diff --git a/Condition_boost.cpp b/Condition_std.cpp similarity index 65% rename from Condition_boost.cpp rename to Condition_std.cpp index 7bb47bc2..2e922d31 100644 --- a/Condition_boost.cpp +++ b/Condition_std.cpp @@ -16,45 +16,30 @@ * along with this program. If not, see . **************************************************************************/ -#include "Condition_boost.h" -#include "Mutex_boost.h" +#include "Condition_std.h" +#include "Mutex_std.h" #include "Server.h" void CCondition::wait(IScopedLock *lock, int timems) { - boost::recursive_mutex::scoped_lock *tl=((CLock*)lock->getLock())->getLock(); + std::unique_lock *tl=((CLock*)lock->getLock())->getLock(); - if(timems<0) + if (timems < 0) + { cond.wait(*tl); + } else { - cond.timed_wait(*tl, getWaitTime(timems)); + cond.wait_for(*tl, std::chrono::milliseconds(timems)); } } -boost::xtime CCondition::getWaitTime(int timeoutms) -{ - boost::xtime xt; -#if BOOST_VERSION < 105000 - xtime_get(&xt, boost::TIME_UTC); -#else - xtime_get(&xt, boost::TIME_UTC_); -#endif - if( timeoutms>1000 ) - { - xt.sec+=timeoutms/1000; - timeoutms=timeoutms%1000; - } - xt.nsec+=timeoutms*1000000; - return xt; -} - -void CCondition::notify_one(void) +void CCondition::notify_one() { cond.notify_one(); } -void CCondition::notify_all(void) +void CCondition::notify_all() { cond.notify_all(); } \ No newline at end of file diff --git a/Condition_std.h b/Condition_std.h new file mode 100644 index 00000000..81b8ef06 --- /dev/null +++ b/Condition_std.h @@ -0,0 +1,16 @@ +#include "Interface/Condition.h" + +#include +#include + +class CCondition : public ICondition +{ +public: + CCondition(void){} + virtual void wait(IScopedLock *lock, int timems=-1); + virtual void notify_one(); + virtual void notify_all(); + +private: + std::condition_variable_any cond; +}; \ No newline at end of file diff --git a/Mutex_boost.h b/Mutex_boost.h deleted file mode 100644 index 2f4a926e..00000000 --- a/Mutex_boost.h +++ /dev/null @@ -1,29 +0,0 @@ -#include "Interface/Mutex.h" - -#include - -class CMutex : public IMutex -{ -public: - CMutex(void); - ~CMutex(void); - virtual void Lock(void); - virtual ILock * Lock2(void); - virtual void Unlock(void); - virtual bool TryLock(void); - -private: - boost::recursive_mutex mutex; - boost::recursive_mutex::scoped_lock *lock; -}; - -class CLock : public ILock -{ -public: - CLock(boost::recursive_mutex::scoped_lock *pLock); - ~CLock(); - boost::recursive_mutex::scoped_lock * getLock(); -private: - - boost::recursive_mutex::scoped_lock * lock; -}; \ No newline at end of file diff --git a/Mutex_boost.cpp b/Mutex_std.cpp similarity index 69% rename from Mutex_boost.cpp rename to Mutex_std.cpp index 16956b30..7a67d261 100644 --- a/Mutex_boost.cpp +++ b/Mutex_std.cpp @@ -1,73 +1,72 @@ -/************************************************************************* -* UrBackup - Client/Server backup system -* Copyright (C) 2011-2015 Martin Raiber -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* 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 Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -**************************************************************************/ - -#include "Mutex_boost.h" - -CMutex::CMutex(void) -{ - lock=NULL; -} - -CMutex::~CMutex(void) -{ -} - -void CMutex::Lock(void) -{ - boost::recursive_mutex::scoped_lock *n_lock=new boost::recursive_mutex::scoped_lock(mutex); - lock=n_lock; -} - -bool CMutex::TryLock(void) -{ - boost::recursive_mutex::scoped_try_lock *n_lock=new boost::recursive_mutex::scoped_try_lock(mutex); - if(n_lock->owns_lock()) - { - lock=(boost::recursive_mutex::scoped_lock*)n_lock; - return true; - } - else - { - return false; - } -} - -ILock* CMutex::Lock2(void) -{ - return new CLock(new boost::recursive_mutex::scoped_lock(mutex)); -} - -void CMutex::Unlock(void) -{ - delete lock; -} - -CLock::CLock(boost::recursive_mutex::scoped_lock *pLock) -{ - lock=pLock; -} -CLock::~CLock() -{ - delete lock; -} - -boost::recursive_mutex::scoped_lock * CLock::getLock() -{ - return lock; -} - +/************************************************************************* +* UrBackup - Client/Server backup system +* Copyright (C) 2011-2015 Martin Raiber +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* 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 Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +**************************************************************************/ + +#include "Mutex_std.h" + +CMutex::CMutex(void) +{ + lock=NULL; +} + +CMutex::~CMutex(void) +{ +} + +void CMutex::Lock(void) +{ + std::unique_lock *n_lock=new std::unique_lock(mutex); + lock=n_lock; +} + +bool CMutex::TryLock(void) +{ + if (mutex.try_lock()) + { + lock = new std::unique_lock(mutex, std::adopt_lock); + return true; + } + else + { + return false; + } +} + +ILock* CMutex::Lock2(void) +{ + return new CLock(new std::unique_lock(mutex)); +} + +void CMutex::Unlock(void) +{ + delete lock; +} + +CLock::CLock(std::unique_lock* pLock) +{ + lock=pLock; +} +CLock::~CLock() +{ + delete lock; +} + +std::unique_lock* CLock::getLock() +{ + return lock; +} + diff --git a/Mutex_std.h b/Mutex_std.h new file mode 100644 index 00000000..c0b66736 --- /dev/null +++ b/Mutex_std.h @@ -0,0 +1,30 @@ +#include "Interface/Mutex.h" + +#include + +class CMutex : public IMutex +{ +public: + CMutex(void); + ~CMutex(void); + virtual void Lock(void); + virtual ILock * Lock2(void); + virtual void Unlock(void); + virtual bool TryLock(void); + +private: + std::recursive_mutex mutex; + std::unique_lock *lock; +}; + +class CLock : public ILock +{ +public: + CLock(std::unique_lock *pLock); + ~CLock(); + + std::unique_lock* getLock(); +private: + + std::unique_lock* lock; +}; \ No newline at end of file diff --git a/Server.cpp b/Server.cpp index 2e71193a..7c4f8b1b 100644 --- a/Server.cpp +++ b/Server.cpp @@ -60,22 +60,17 @@ -#ifdef THREAD_BOOST -#include -#include -#include -#include "Mutex_boost.h" -#include "Condition_boost.h" -#include "SharedMutex_boost.h" -#else #ifdef _WIN32 +#include +#include "Mutex_std.h" +#include "Condition_std.h" +#include "SharedMutex_std.h" #else #include #include "Mutex_lin.h" #include "Condition_lin.h" #include "SharedMutex_lin.h" #endif -#endif #ifdef _WIN32 # include @@ -775,8 +770,8 @@ THREAD_ID CServer::getThreadID(void) #ifdef THREAD_BOOST IScopedLock lock(thread_mutex); - boost::thread::id ct=boost::this_thread::get_id(); - std::map::iterator iter=threads.find(ct); + std::thread::id ct = std::this_thread::get_id(); + std::map::iterator iter=threads.find(ct); if(iter!=threads.end() ) { @@ -787,7 +782,7 @@ THREAD_ID CServer::getThreadID(void) if( curr_thread_id>=MAX_THREAD_ID ) curr_thread_id=0; - threads.insert( std::pair( ct, curr_thread_id) ); + threads.insert( std::pair( ct, curr_thread_id) ); return curr_thread_id; #else @@ -1237,12 +1232,9 @@ void* thread_helper_f(void * t) void CServer::createThread(IThread *thread) { -#ifdef THREAD_BOOST - boost::thread tr(thread_helper_f, thread); - tr.yield(); -#else #ifdef _WIN32 - + std::thread tr(thread_helper_f, thread); + tr.detach(); #else pthread_attr_t attr; pthread_attr_init(&attr); @@ -1257,7 +1249,6 @@ void CServer::createThread(IThread *thread) pthread_attr_destroy(&attr); #endif -#endif //THREAD_BOOST } IThreadPool *CServer::getThreadPool(void) diff --git a/Server.h b/Server.h index b9019b66..e4ee513e 100644 --- a/Server.h +++ b/Server.h @@ -1,14 +1,11 @@ #pragma once #define NO_INTERFACE -#ifdef THREAD_BOOST -# include -#else #ifdef _WIN32 +# include #else # include #endif -#endif #include "Interface/Server.h" #include "Interface/Action.h" @@ -228,7 +225,7 @@ private: THREAD_ID curr_thread_id; #ifdef THREAD_BOOST - std::map threads; + std::map threads; #else #ifdef _WIN32 #else diff --git a/SharedMutex_boost.h b/SharedMutex_boost.h deleted file mode 100644 index e5e8d3b4..00000000 --- a/SharedMutex_boost.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include -#include - -#include "Interface/SharedMutex.h" -#include - -class SharedMutex : public ISharedMutex -{ -public: - virtual ILock* readLock(); - - virtual ILock* writeLock(); - -private: - boost::shared_mutex mutex; -}; - -class ReadLock : public ILock -{ -public: - ReadLock(boost::shared_lock* read_lock); - -private: - std::auto_ptr > read_lock; -}; - -class WriteLock : public ILock -{ -public: - WriteLock(boost::unique_lock* write_lock); - -private: - std::auto_ptr > write_lock; -}; \ No newline at end of file diff --git a/SharedMutex_boost.cpp b/SharedMutex_std.cpp similarity index 74% rename from SharedMutex_boost.cpp rename to SharedMutex_std.cpp index 2729025f..4044b3d6 100644 --- a/SharedMutex_boost.cpp +++ b/SharedMutex_std.cpp @@ -1,43 +1,43 @@ -/************************************************************************* -* UrBackup - Client/Server backup system -* Copyright (C) 2011-2015 Martin Raiber -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* 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 Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -**************************************************************************/ - -#include "SharedMutex_boost.h" - - -ILock* SharedMutex::readLock() -{ - return new ReadLock(new boost::shared_lock(mutex)); -} - -ILock* SharedMutex::writeLock() -{ - return new WriteLock(new boost::unique_lock(mutex)); -} - - -ReadLock::ReadLock( boost::shared_lock* read_lock ) - : read_lock(read_lock) -{ - -} - -WriteLock::WriteLock( boost::unique_lock* write_lock ) - : write_lock(write_lock) -{ - -} +/************************************************************************* +* UrBackup - Client/Server backup system +* Copyright (C) 2011-2015 Martin Raiber +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* 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 Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +**************************************************************************/ + +#include "SharedMutex_std.h" + + +ILock* SharedMutex::readLock() +{ + return new ReadLock(new std::shared_lock(mutex)); +} + +ILock* SharedMutex::writeLock() +{ + return new WriteLock(new std::unique_lock(mutex)); +} + + +ReadLock::ReadLock( std::shared_lock* read_lock ) + : read_lock(read_lock) +{ + +} + +WriteLock::WriteLock( std::unique_lock* write_lock ) + : write_lock(write_lock) +{ + +} diff --git a/SharedMutex_std.h b/SharedMutex_std.h new file mode 100644 index 00000000..46c1d4d8 --- /dev/null +++ b/SharedMutex_std.h @@ -0,0 +1,35 @@ +#pragma once + +#include + +#include "Interface/SharedMutex.h" +#include + +class SharedMutex : public ISharedMutex +{ +public: + virtual ILock* readLock(); + + virtual ILock* writeLock(); + +private: + std::shared_timed_mutex mutex; +}; + +class ReadLock : public ILock +{ +public: + ReadLock(std::shared_lock* read_lock); + +private: + std::auto_ptr > read_lock; +}; + +class WriteLock : public ILock +{ +public: + WriteLock(std::unique_lock* write_lock); + +private: + std::auto_ptr > write_lock; +}; \ No newline at end of file diff --git a/UrBackupBackendVS12.sln b/UrBackupBackendVS12.sln deleted file mode 100644 index f453f363..00000000 --- a/UrBackupBackendVS12.sln +++ /dev/null @@ -1,202 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileservplugin", "fileservplugin\fileservpluginVS12.vcxproj", "{4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fsimageplugin", "fsimageplugin\fsimagepluginVS12.vcxproj", "{7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "urlplugin", "urlplugin\urlpluginVS12.vcxproj", "{8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "urbackupserver", "urbackupserver\urbackupserverVS12.vcxproj", "{F97AB52D-CF1E-4D8B-A897-B15EC738CC34}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "urbackupclient", "urbackupclient\urbackupclientVS12.vcxproj", "{240F81D1-45E1-4A7A-885C-4887C89D22A3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server", "CompiledServerVS12.vcxproj", "{20BFD99C-1822-4447-ABE6-EA6902C1C4E9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptoplugin", "cryptoplugin\cryptopluginVS12.vcxproj", "{7A00E221-3898-4F3E-B38D-6923274D4E05}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpserver", "httpserver\httpserverVS12.vcxproj", "{A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sysvol_test", "urbackupclient\sysvol_test\sysvol_testVS12.vcxproj", "{91F5BC8A-ED9B-4C98-AD75-DA137FF72778}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{143E7E9B-6D5D-4AC9-A1BB-A692558B1050}" - ProjectSection(SolutionItems) = preProject - SolutionDependencies.props = SolutionDependencies.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release Server PreVista|Win32 = Release Server PreVista|Win32 - Release Server PreVista|x64 = Release Server PreVista|x64 - Release Service|Win32 = Release Service|Win32 - Release Service|x64 = Release Service|x64 - Release x64|Win32 = Release x64|Win32 - Release x64|x64 = Release x64|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Debug|Win32.Build.0 = Debug|Win32 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Debug|x64.ActiveCfg = Debug|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Debug|x64.Build.0 = Debug|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release Server PreVista|Win32.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release Server PreVista|x64.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release Server PreVista|x64.Build.0 = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release Service|Win32.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release Service|x64.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release Service|x64.Build.0 = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release x64|Win32.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release x64|x64.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release x64|x64.Build.0 = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release|Win32.ActiveCfg = Release|Win32 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release|Win32.Build.0 = Release|Win32 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release|x64.ActiveCfg = Release|x64 - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4}.Release|x64.Build.0 = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Debug|Win32.ActiveCfg = Debug|Win32 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Debug|Win32.Build.0 = Debug|Win32 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Debug|x64.ActiveCfg = Debug|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Debug|x64.Build.0 = Debug|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release Server PreVista|Win32.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release Server PreVista|x64.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release Server PreVista|x64.Build.0 = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release Service|Win32.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release Service|x64.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release Service|x64.Build.0 = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release x64|Win32.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release x64|x64.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release x64|x64.Build.0 = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release|Win32.ActiveCfg = Release|Win32 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release|Win32.Build.0 = Release|Win32 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release|x64.ActiveCfg = Release|x64 - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3}.Release|x64.Build.0 = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Debug|Win32.Build.0 = Debug|Win32 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Debug|x64.ActiveCfg = Debug|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Debug|x64.Build.0 = Debug|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release Server PreVista|Win32.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release Server PreVista|x64.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release Server PreVista|x64.Build.0 = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release Service|Win32.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release Service|x64.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release Service|x64.Build.0 = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release x64|Win32.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release x64|x64.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release x64|x64.Build.0 = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release|Win32.ActiveCfg = Release|Win32 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release|Win32.Build.0 = Release|Win32 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release|x64.ActiveCfg = Release|x64 - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F}.Release|x64.Build.0 = Release|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Debug|Win32.ActiveCfg = Debug|Win32 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Debug|Win32.Build.0 = Debug|Win32 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Debug|x64.ActiveCfg = Debug|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Debug|x64.Build.0 = Debug|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Server PreVista|Win32.ActiveCfg = Release Server PreVista|Win32 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Server PreVista|Win32.Build.0 = Release Server PreVista|Win32 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Server PreVista|x64.ActiveCfg = Release Server PreVista|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Server PreVista|x64.Build.0 = Release Server PreVista|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Service|Win32.ActiveCfg = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Service|x64.ActiveCfg = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release Service|x64.Build.0 = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release x64|Win32.ActiveCfg = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release x64|x64.ActiveCfg = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release x64|x64.Build.0 = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release|Win32.ActiveCfg = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release|x64.ActiveCfg = Release Server|x64 - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34}.Release|x64.Build.0 = Release Server|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Debug|Win32.ActiveCfg = Debug|Win32 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Debug|Win32.Build.0 = Debug|Win32 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Debug|x64.ActiveCfg = Debug|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Debug|x64.Build.0 = Debug|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release Server PreVista|Win32.ActiveCfg = Release Server 2003|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release Server PreVista|x64.ActiveCfg = Release Server 2003|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release Server PreVista|x64.Build.0 = Release Server 2003|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release Service|Win32.ActiveCfg = Release Server 2003|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release Service|x64.ActiveCfg = Release Server 2003|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release Service|x64.Build.0 = Release Server 2003|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release x64|Win32.ActiveCfg = Release x64|Win32 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release x64|Win32.Build.0 = Release x64|Win32 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release x64|x64.ActiveCfg = Release x64|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release x64|x64.Build.0 = Release x64|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release|Win32.ActiveCfg = Release|Win32 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release|Win32.Build.0 = Release|Win32 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release|x64.ActiveCfg = Release|x64 - {240F81D1-45E1-4A7A-885C-4887C89D22A3}.Release|x64.Build.0 = Release|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Debug|Win32.ActiveCfg = Debug|Win32 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Debug|Win32.Build.0 = Debug|Win32 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Debug|x64.ActiveCfg = Debug|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Debug|x64.Build.0 = Debug|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Server PreVista|Win32.ActiveCfg = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Server PreVista|x64.ActiveCfg = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Server PreVista|x64.Build.0 = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Service|Win32.ActiveCfg = Release Service|Win32 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Service|Win32.Build.0 = Release Service|Win32 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Service|x64.ActiveCfg = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release Service|x64.Build.0 = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release x64|Win32.ActiveCfg = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release x64|x64.ActiveCfg = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release x64|x64.Build.0 = Release Service|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release|Win32.ActiveCfg = Release|Win32 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release|Win32.Build.0 = Release|Win32 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release|x64.ActiveCfg = Release|x64 - {20BFD99C-1822-4447-ABE6-EA6902C1C4E9}.Release|x64.Build.0 = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Debug|Win32.ActiveCfg = Debug|Win32 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Debug|Win32.Build.0 = Debug|Win32 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Debug|x64.ActiveCfg = Debug|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Debug|x64.Build.0 = Debug|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release Server PreVista|Win32.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release Server PreVista|x64.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release Server PreVista|x64.Build.0 = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release Service|Win32.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release Service|x64.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release Service|x64.Build.0 = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release x64|Win32.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release x64|x64.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release x64|x64.Build.0 = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release|Win32.ActiveCfg = Release|Win32 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release|Win32.Build.0 = Release|Win32 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release|x64.ActiveCfg = Release|x64 - {7A00E221-3898-4F3E-B38D-6923274D4E05}.Release|x64.Build.0 = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Debug|Win32.Build.0 = Debug|Win32 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Debug|x64.ActiveCfg = Debug|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Debug|x64.Build.0 = Debug|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release Server PreVista|Win32.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release Server PreVista|x64.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release Server PreVista|x64.Build.0 = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release Service|Win32.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release Service|x64.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release Service|x64.Build.0 = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release x64|Win32.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release x64|x64.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release x64|x64.Build.0 = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release|Win32.ActiveCfg = Release|Win32 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release|Win32.Build.0 = Release|Win32 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release|x64.ActiveCfg = Release|x64 - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5}.Release|x64.Build.0 = Release|x64 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Debug|Win32.ActiveCfg = Debug|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Debug|Win32.Build.0 = Debug|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Debug|x64.ActiveCfg = Debug|x64 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Debug|x64.Build.0 = Debug|x64 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release Server PreVista|Win32.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release Server PreVista|Win32.Build.0 = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release Server PreVista|x64.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release Service|Win32.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release Service|Win32.Build.0 = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release Service|x64.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release x64|Win32.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release x64|Win32.Build.0 = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release x64|x64.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release|Win32.ActiveCfg = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release|Win32.Build.0 = Release|Win32 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release|x64.ActiveCfg = Release|x64 - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/clientctl/clientctl.vcxproj b/clientctl/clientctl.vcxproj index 215bd2d2..6138db81 100644 --- a/clientctl/clientctl.vcxproj +++ b/clientctl/clientctl.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,14 @@ Application true Unicode + v140 Application false true Unicode + v140 diff --git a/cryptoplugin/cryptoplugin.vcxproj b/cryptoplugin/cryptoplugin.vcxproj index 8a7fce0c..73788e60 100644 --- a/cryptoplugin/cryptoplugin.vcxproj +++ b/cryptoplugin/cryptoplugin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,19 +28,23 @@ DynamicLibrary Unicode true + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode + v140 @@ -88,7 +92,7 @@ Disabled - D:\Developement\Cryptopp561;%(AdditionalIncludeDirectories) + $(CryptoppIncludeDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPTOPLUGIN_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -100,8 +104,8 @@ /LTCG %(AdditionalOptions) - cryptlib.lib;%(AdditionalDependencies) - D:\Developement\Cryptopp561\Win32\Output\Debug;%(AdditionalLibraryDirectories) + cryptlibd_x86.lib;%(AdditionalDependencies) + $(CryptoppLibDir);%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -110,7 +114,7 @@ Disabled - D:\Developement\Cryptopp561;%(AdditionalIncludeDirectories) + $(CryptoppIncludeDir);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPTOPLUGIN_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -120,8 +124,8 @@ ProgramDatabase - cryptlib.lib;%(AdditionalDependencies) - D:\Developement\Cryptopp561\x64\Output\Debug;%(AdditionalLibraryDirectories) + cryptlibd_x86_64.lib;%(AdditionalDependencies) + $(CryptoppLibDir);%(AdditionalLibraryDirectories) true Windows @@ -137,7 +141,7 @@ Level3 ProgramDatabase - D:\Developement\Cryptopp561 + $(CryptoppIncludeDir) true @@ -145,8 +149,8 @@ true true MachineX86 - D:\Developement\Cryptopp561\Win32\Output\Release - cryptlib.lib;%(AdditionalDependencies) + $(CryptoppLibDir);%(AdditionalLibraryDirectories) + cryptlib_x86.lib;%(AdditionalDependencies) @@ -160,15 +164,15 @@ Level3 ProgramDatabase - D:\Developement\Cryptopp561 + $(CryptoppIncludeDir) true Windows true true - D:\Developement\Cryptopp561\x64\Output\Release - cryptlib.lib;%(AdditionalDependencies) + $(CryptoppLibDir);%(AdditionalLibraryDirectories) + cryptlib_x86_64.lib;%(AdditionalDependencies) diff --git a/cryptoplugin/cryptopluginVS12.vcxproj b/cryptoplugin/cryptopluginVS12.vcxproj deleted file mode 100644 index 49bb5c07..00000000 --- a/cryptoplugin/cryptopluginVS12.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7A00E221-3898-4F3E-B38D-6923274D4E05} - cryptoplugin - Win32Proj - cryptoplugin - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - $(CryptoppIncludeDir);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPTOPLUGIN_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - /LTCG %(AdditionalOptions) - cryptlib.lib;%(AdditionalDependencies) - $(CryptoppLibDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - - - Disabled - $(CryptoppIncludeDir);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPTOPLUGIN_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - cryptlib.lib;%(AdditionalDependencies) - $(CryptoppLibDir);%(AdditionalLibraryDirectories) - true - Windows - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPTOPLUGIN_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - $(CryptoppIncludeDir);%(AdditionalIncludeDirectories) - - - true - Windows - true - true - MachineX86 - $(CryptoppLibDir);%(AdditionalLibraryDirectories) - cryptlib.lib;%(AdditionalDependencies) - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPTOPLUGIN_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - $(CryptoppIncludeDir);%(AdditionalIncludeDirectories) - - - true - Windows - true - true - $(CryptoppLibDir);%(AdditionalLibraryDirectories) - cryptlib.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cryptoplugin/cryptopluginVS12.vcxproj.filters b/cryptoplugin/cryptopluginVS12.vcxproj.filters deleted file mode 100644 index aa0ad471..00000000 --- a/cryptoplugin/cryptopluginVS12.vcxproj.filters +++ /dev/null @@ -1,75 +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 - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - \ No newline at end of file diff --git a/fileservplugin/fileservplugin.vcxproj b/fileservplugin/fileservplugin.vcxproj index f129d39b..4de9fced 100644 --- a/fileservplugin/fileservplugin.vcxproj +++ b/fileservplugin/fileservplugin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,19 +28,23 @@ DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 diff --git a/fileservplugin/fileservpluginVS12.vcxproj b/fileservplugin/fileservpluginVS12.vcxproj deleted file mode 100644 index f7a79d5f..00000000 --- a/fileservplugin/fileservpluginVS12.vcxproj +++ /dev/null @@ -1,228 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4ECD51DA-3EFA-4700-9FCB-BCBA05640CB4} - fileservplugin - Win32Proj - fileservplugin - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - MachineX64 - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fileservplugin/fileservpluginVS12.vcxproj.filters b/fileservplugin/fileservpluginVS12.vcxproj.filters deleted file mode 100644 index e5fbf0ea..00000000 --- a/fileservplugin/fileservpluginVS12.vcxproj.filters +++ /dev/null @@ -1,147 +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 - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - \ No newline at end of file diff --git a/fsimageplugin/fsimageplugin.vcxproj b/fsimageplugin/fsimageplugin.vcxproj index f5f615f4..02f8c5ba 100644 --- a/fsimageplugin/fsimageplugin.vcxproj +++ b/fsimageplugin/fsimageplugin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,19 +28,23 @@ DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 diff --git a/fsimageplugin/fsimageplugin.vcxproj.filters b/fsimageplugin/fsimageplugin.vcxproj.filters deleted file mode 100644 index 34e893c7..00000000 --- a/fsimageplugin/fsimageplugin.vcxproj.filters +++ /dev/null @@ -1,117 +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 - - - {982c46d1-3fdc-401d-b22f-4c1235fb3503} - - - {055df030-b133-4fa0-acf5-d85223e38cc9} - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - fs - - - fs - - - fs - - - sha2 - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - fs - - - fs - - - fs - - - sha2 - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - \ No newline at end of file diff --git a/fsimageplugin/fsimagepluginVS12.vcxproj b/fsimageplugin/fsimagepluginVS12.vcxproj deleted file mode 100644 index 2d3fd754..00000000 --- a/fsimageplugin/fsimagepluginVS12.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7416F42E-0D3D-42CA-9F31-8C26D58DE5B3} - fsimageplugin - Win32Proj - fsimageplugin - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;FSIMAGEPLUGIN_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Windows - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;FSIMAGEPLUGIN_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Windows - true - true - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;FSIMAGEPLUGIN_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Windows - MachineX64 - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;FSIMAGEPLUGIN_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fsimageplugin/fsimagepluginVS12.vcxproj.filters b/fsimageplugin/fsimagepluginVS12.vcxproj.filters deleted file mode 100644 index 4f2bbb29..00000000 --- a/fsimageplugin/fsimagepluginVS12.vcxproj.filters +++ /dev/null @@ -1,105 +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 - - - {982c46d1-3fdc-401d-b22f-4c1235fb3503} - - - {055df030-b133-4fa0-acf5-d85223e38cc9} - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - fs - - - fs - - - fs - - - sha2 - - - Quelldateien - - - Quelldateien - - - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - fs - - - fs - - - fs - - - sha2 - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - \ No newline at end of file diff --git a/httpserver/httpserver.vcxproj b/httpserver/httpserver.vcxproj index 53d03115..7a4c3b66 100644 --- a/httpserver/httpserver.vcxproj +++ b/httpserver/httpserver.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,19 +28,23 @@ DynamicLibrary Unicode true + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode + v140 diff --git a/httpserver/httpserverVS12.vcxproj b/httpserver/httpserverVS12.vcxproj deleted file mode 100644 index 81b38d4c..00000000 --- a/httpserver/httpserverVS12.vcxproj +++ /dev/null @@ -1,190 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A4E4AA81-F6C9-476F-A2E4-5D6E3B4EC2B5} - httpserver - Win32Proj - httpserver - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - true - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Configuration)\ - $(Platform)\$(Configuration)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPSERVER_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Windows - MachineX86 - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPSERVER_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Windows - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPSERVER_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Windows - true - true - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPSERVER_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Windows - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/httpserver/httpserverVS12.vcxproj.filters b/httpserver/httpserverVS12.vcxproj.filters deleted file mode 100644 index 6a4190fc..00000000 --- a/httpserver/httpserverVS12.vcxproj.filters +++ /dev/null @@ -1,72 +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 - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - \ No newline at end of file diff --git a/maintest.cpp b/maintest.cpp index 71ff5894..a48ba98c 100644 --- a/maintest.cpp +++ b/maintest.cpp @@ -20,14 +20,13 @@ #include "ThreadPool.h" #include -#include - #include +#include using namespace std; std::deque rands; -boost::mutex gmutex; +std::mutex gmutex; class Test1 : public IThread { @@ -38,7 +37,7 @@ public: int s; { - boost::mutex::scoped_lock lock(gmutex); + std::lock_guard lock(gmutex); s=rands.front()%60000+2000; rands.erase( rands.begin() ); } diff --git a/urbackupclient/sysvol_test/sysvol_test.vcxproj b/urbackupclient/sysvol_test/sysvol_test.vcxproj index 5778e8f0..8eb2c7bb 100644 --- a/urbackupclient/sysvol_test/sysvol_test.vcxproj +++ b/urbackupclient/sysvol_test/sysvol_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,23 +28,27 @@ Application true Unicode + v140 Application true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 diff --git a/urbackupclient/sysvol_test/sysvol_testVS12.vcxproj b/urbackupclient/sysvol_test/sysvol_testVS12.vcxproj deleted file mode 100644 index 569cf93f..00000000 --- a/urbackupclient/sysvol_test/sysvol_testVS12.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {91F5BC8A-ED9B-4C98-AD75-DA137FF72778} - Win32Proj - sysvol_test - sysvol_test - - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - false - true - Unicode - v120 - - - Application - false - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;NO_SERVER;%(PreprocessorDefinitions) - D:\boost - - - Console - true - ../../libx86 - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;NO_SERVER;%(PreprocessorDefinitions) - D:\boost - - - Console - true - ../../libx86 - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;NO_SERVER;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;NO_SERVER;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - - - - \ No newline at end of file diff --git a/urbackupclient/sysvol_test/sysvol_testVS12.vcxproj.filters b/urbackupclient/sysvol_test/sysvol_testVS12.vcxproj.filters deleted file mode 100644 index 5a8ff38c..00000000 --- a/urbackupclient/sysvol_test/sysvol_testVS12.vcxproj.filters +++ /dev/null @@ -1,33 +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;mfcribbon-ms - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - - - Headerdateien - - - \ No newline at end of file diff --git a/urbackupclient/urbackupclient.vcxproj b/urbackupclient/urbackupclient.vcxproj index b9fccda3..46cf26db 100644 --- a/urbackupclient/urbackupclient.vcxproj +++ b/urbackupclient/urbackupclient.vcxproj @@ -1,5 +1,5 @@  - + Debug WinXP @@ -148,63 +148,76 @@ {28D66E10-BF1E-45E3-B4E0-77920126531B} urbackup Win32Proj + 8.1 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode true + v140_xp DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode true + v140_xp DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 diff --git a/urbackupclient/urbackupclientVS12.vcxproj b/urbackupclient/urbackupclientVS12.vcxproj deleted file mode 100644 index 03f38410..00000000 --- a/urbackupclient/urbackupclientVS12.vcxproj +++ /dev/null @@ -1,593 +0,0 @@ - - - - - Debug WinXP - Win32 - - - Debug WinXP - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release Server 2003 - Win32 - - - Release Server 2003 - x64 - - - Release WinXP - Win32 - - - Release WinXP - x64 - - - Release x64 - Win32 - - - Release x64 - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {240F81D1-45E1-4A7A-885C-4887C89D22A3} - urbackup - Win32Proj - urbackupclient - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;%(PreprocessorDefinitions); - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - true - Windows - MachineX64 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;%(PreprocessorDefinitions);CLIENT_ONLY - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;CLIENT_ONLY;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - - MaxSpeed - true - $(VSS_SDK_DIR)\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;VSS_XP;%(PreprocessorDefinitions);CLIENT_ONLY;_WIN_PRE_VISTA - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;vssapi.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_xp.dll - $(VSS_SDK_DIR)\lib\winxp\obj\i386;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(VSS_SDK_DIR)\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;VSS_XP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;vssapi.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_xp.dll - $(VSS_SDK_DIR)\lib\winxp\obj\i386;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX64 - - - - - MaxSpeed - true - $(VSS_SDK_DIR)\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;VSS_S03;%(PreprocessorDefinitions);CLIENT_ONLY;_WIN_PRE_VISTA - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;vssapi.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_server03.dll - $(VSS_SDK_DIR)\lib\win2003\obj\i386;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(VSS_SDK_DIR)\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;VSS_S03;CLIENT_ONLY;_WIN_PRE_VISTA;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;vssapi.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_server03.dll - $(VSS_SDK_DIR)\lib\win2003\obj\amd64;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX64 - - - - - Disabled - $(VSS_SDK_DIR)\inc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;VSS_XP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - $(VSS_SDK_DIR)\lib\winxp\obj\i386;%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - C:\Programme\Microsoft\VSSSDK72\inc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;VSS_XP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi_xp.Lib;%(AdditionalDependencies) - C:\Programme\Microsoft\VSSSDK72\lib\winxp\obj\i386;%(AdditionalLibraryDirectories) - true - Windows - MachineX64 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;%(PreprocessorDefinitions);CLIENT_ONLY - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;%(PreprocessorDefinitions);CLIENT_ONLY - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - - - \ No newline at end of file diff --git a/urbackupclient/urbackupclientVS12.vcxproj.filters b/urbackupclient/urbackupclientVS12.vcxproj.filters deleted file mode 100644 index fc9b37ac..00000000 --- a/urbackupclient/urbackupclientVS12.vcxproj.filters +++ /dev/null @@ -1,222 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {0678a4ff-fca2-4048-86b9-8528e6621f14} - - - {d7a7cd78-b293-49b5-bb87-4e3461a306af} - - - {8d6f30f4-00a8-4748-aea5-692bd3875606} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - watchdir - - - watchdir - - - watchdir - - - sha2 - - - watchdir - - - watchdir - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - glob - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - watchdir - - - - - watchdir - - - watchdir - - - watchdir - - - watchdir - - - sha2 - - - watchdir - - - watchdir - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - watchdir - - - \ No newline at end of file diff --git a/urbackupcommon/os_functions_win.cpp b/urbackupcommon/os_functions_win.cpp index b38d06f0..aa2f50d6 100644 --- a/urbackupcommon/os_functions_win.cpp +++ b/urbackupcommon/os_functions_win.cpp @@ -84,23 +84,6 @@ namespace }; } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; - typedef struct { - DWORD RecordLength; - WORD MajorVersion; - WORD MinorVersion; - BYTE FileReferenceNumber[16]; - BYTE ParentFileReferenceNumber[16]; - USN Usn; - LARGE_INTEGER TimeStamp; - DWORD Reason; - DWORD SourceInfo; - DWORD SecurityId; - DWORD FileAttributes; - WORD FileNameLength; - WORD FileNameOffset; - WCHAR FileName[1]; - } USN_RECORD_V3, *PUSN_RECORD_V3; - } diff --git a/urbackupserver/urbackupserver.vcxproj b/urbackupserver/urbackupserver.vcxproj index 5eb3fdfe..897ba5a5 100644 --- a/urbackupserver/urbackupserver.vcxproj +++ b/urbackupserver/urbackupserver.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -36,29 +36,35 @@ DynamicLibrary Unicode true + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode true + v140 DynamicLibrary Unicode + v140 diff --git a/urbackupserver/urbackupserverVS12.vcxproj b/urbackupserver/urbackupserverVS12.vcxproj deleted file mode 100644 index 2937c091..00000000 --- a/urbackupserver/urbackupserverVS12.vcxproj +++ /dev/null @@ -1,412 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release Server PreVista - Win32 - - - Release Server PreVista - x64 - - - Release Server - Win32 - - - Release Server - x64 - - - - {F97AB52D-CF1E-4D8B-A897-B15EC738CC34} - urbackup - Win32Proj - urbackupserver - - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - true - v120 - - - DynamicLibrary - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - ws2_32.lib;VssApi.Lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;USE_NTFS_TXF;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - ws2_32.lib;VssApi.Lib;Ktmw32.lib;%(AdditionalDependencies) - true - Windows - MachineX64 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;SERVER_ONLY;USE_NTFS_TXF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;Ktmw32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;SERVER_ONLY;_WIN_PRE_VISTA;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;SERVER_ONLY;USE_NTFS_TXF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;Ktmw32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;URBACKUP_EXPORTS;_WIN_PRE_VISTA;SERVER_ONLY;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/urbackupserver/urbackupserverVS12.vcxproj.filters b/urbackupserver/urbackupserverVS12.vcxproj.filters deleted file mode 100644 index e744469d..00000000 --- a/urbackupserver/urbackupserverVS12.vcxproj.filters +++ /dev/null @@ -1,474 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {f70d5b3e-4aa3-4fea-9439-c17050638704} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {1e3a9954-74c9-4bbf-b99c-4f78b6bd555f} - - - {3ff5bf0a-dd61-4c91-880e-180063d4f39c} - - - {94c028c2-e88e-4a63-ab20-e68be5608bbb} - - - {70354eae-bf63-425c-ae8a-b5ac6085389f} - - - {d00660ff-cb0c-4ce2-bd39-00a7f46d3b65} - - - {d80d7c4b-6a29-4bb9-9ba5-4c0edc38058b} - - - {85f47f3b-2e45-4b5c-96c7-cb2511e6ba0b} - - - {3ec8a037-dfb3-443f-aa14-dd5a1f016e35} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - fileclient - - - Quelldateien - - - treediff - - - treediff - - - treediff - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - fileclient - - - sha2 - - - serverinterface - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - fileclient - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - Quelldateien - - - fileclient - - - serverinterface - - - Quelldateien - - - Quelldateien - - - apps - - - dao - - - lmdb - - - lmdb - - - filescache - - - filescache - - - filescache - - - filescache - - - filescache - - - serverinterface - - - apps - - - serverinterface - - - serverinterface - - - serverinterface - - - serverinterface - - - Quelldateien - - - dao - - - apps - - - Quelldateien - - - Quelldateien - - - fileclient - - - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - fileclient - - - Headerdateien - - - Headerdateien - - - treediff - - - treediff - - - treediff - - - serverinterface - - - serverinterface - - - serverinterface - - - fileclient - - - sha2 - - - Headerdateien - - - fileclient - - - fileclient - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - fileclient - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - Headerdateien - - - fileclient - - - Headerdateien - - - apps - - - dao - - - lmdb - - - lmdb - - - Headerdateien - - - filescache - - - filescache - - - filescache - - - filescache - - - serverinterface - - - apps - - - serverinterface - - - Headerdateien - - - dao - - - apps - - - serverinterface - - - apps - - - Headerdateien - - - Headerdateien - - - fileclient - - - \ No newline at end of file diff --git a/urlplugin/urlplugin.vcxproj b/urlplugin/urlplugin.vcxproj index 2226c702..fbcbbdba 100644 --- a/urlplugin/urlplugin.vcxproj +++ b/urlplugin/urlplugin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,23 +28,27 @@ DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary false true Unicode + v140 DynamicLibrary false true Unicode + v140 @@ -80,14 +84,14 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ./lib86/inc;D:\Developement\urbackup_libs\lib86\inc + WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) + $(CurlIncludeDir) Console true - ./lib86;D:\Developement\urbackup_libs\lib86 - libcurl_imp.lib;%(AdditionalDependencies) + $(CurlLibDir) + libcurld_x86.lib;ws2_32.lib;wldap32.lib;normaliz.lib;%(AdditionalDependencies) @@ -96,14 +100,14 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ./lib64/inc;D:\Developement\urbackup_libs\lib64\inc + WIN32;_DEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) + $(CurlIncludeDir) Console true - ./lib64;D:\Developement\urbackup_libs\lib64 - libcurl.lib;%(AdditionalDependencies) + $(CurlLibDir) + libcurld_x86_64.lib;%(AdditionalDependencies) @@ -114,8 +118,8 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ./lib86/inc;D:\Developement\urbackup_libs\lib86\inc + WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) + $(CurlIncludeDir) Console @@ -124,8 +128,8 @@ true - libcurl_imp.lib;%(AdditionalDependencies) - ./lib86;D:\Developement\urbackup_libs\lib86 + libcurl_x86.lib;ws2_32.lib;wldap32.lib;normaliz.lib;%(AdditionalDependencies) + $(CurlLibDir) @@ -136,16 +140,16 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ./lib64/inc;D:\Developement\urbackup_libs\lib64\inc + WIN32;NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) + $(CurlIncludeDir) Console true true true - ./lib64;D:\Developement\urbackup_libs\lib64 - libcurl.lib;%(AdditionalDependencies) + $(CurlLibDir) + libcurl_x86_64.lib;ws2_32.lib;wldap32.lib;normaliz.lib;%(AdditionalDependencies) diff --git a/urlplugin/urlpluginVS12.vcxproj b/urlplugin/urlpluginVS12.vcxproj deleted file mode 100644 index f6c9bbdf..00000000 --- a/urlplugin/urlpluginVS12.vcxproj +++ /dev/null @@ -1,174 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8AF65E2C-BCBD-48EC-976B-49DAD9467B2F} - Win32Proj - urlplugin - urlplugin - - - - DynamicLibrary - true - Unicode - v120 - - - DynamicLibrary - true - Unicode - v120 - - - DynamicLibrary - false - true - Unicode - v120 - - - DynamicLibrary - false - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(CurlIncludeDir);%(AdditionalIncludeDirectories) - - - Console - true - $(CurlLibDir);%(AdditionalLibraryDirectories) - libcurl.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(CurlIncludeDir);%(AdditionalIncludeDirectories) - - - Console - true - $(CurlLibDir);%(AdditionalLibraryDirectories) - libcurl.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(CurlIncludeDir);%(AdditionalIncludeDirectories) - - - Console - true - true - true - - - libcurl.lib;%(AdditionalDependencies) - $(CurlLibDir);%(AdditionalLibraryDirectories) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(CurlIncludeDir);%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(CurlLibDir);%(AdditionalLibraryDirectories) - libcurl.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/urlplugin/urlpluginVS12.vcxproj.filters b/urlplugin/urlpluginVS12.vcxproj.filters deleted file mode 100644 index 977f9373..00000000 --- a/urlplugin/urlpluginVS12.vcxproj.filters +++ /dev/null @@ -1,42 +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;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file