summaryrefslogtreecommitdiff
path: root/plugins/Dbx_mmap_SA/Dbtool
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-07-23 07:10:03 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-07-23 07:10:03 +0000
commitd828acae837c71992f6a5f9dd688ba7afd944e56 (patch)
tree3be6506a6bbf40798199e07d4e2a0f0eef721efc /plugins/Dbx_mmap_SA/Dbtool
parent9126d2b133d00b836fca640f847a0948f7579e02 (diff)
Dbx_mmap_SA, Import_SA, Dbtool_SA: changed folder structure
git-svn-id: http://svn.miranda-ng.org/main/trunk@1108 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Dbx_mmap_SA/Dbtool')
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj70
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters66
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/res/Version.rc (renamed from plugins/Dbx_mmap_SA/Dbtool/Version.rc)2
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/res/dbtool.exe.manifest (renamed from plugins/Dbx_mmap_SA/Dbtool/dbtool.exe.manifest)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/res/resource.rc (renamed from plugins/Dbx_mmap_SA/Dbtool/resource.rc)16
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/Version.h (renamed from plugins/Dbx_mmap_SA/Dbtool/Version.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/aggressive.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/cleaning.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/cleaning.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/contactchain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/database.h (renamed from plugins/Dbx_mmap_SA/Dbtool/database.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/dbtool.h (renamed from plugins/Dbx_mmap_SA/Dbtool/dbtool.h)2
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/disk.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/disk.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/encryption.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/encryption.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/eventchain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/fileaccess.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/fileaccess.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/finaltasks.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/finished.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/finished.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/initialchecks.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/main.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/main.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/modulechain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/openerror.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/openerror.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/progress.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/progress.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/resource.h (renamed from plugins/Dbx_mmap_SA/Dbtool/resource.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/selectdb.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/settingschain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/user.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/user.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/utf.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/utf.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/welcome.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/welcome.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/wizard.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/wizard.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Dbtool/src/worker.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/worker.cpp)0
30 files changed, 67 insertions, 89 deletions
diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj
index 0aa02d798d..7b734e1736 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj
+++ b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj
@@ -69,14 +69,13 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -99,13 +98,12 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -130,14 +128,13 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
@@ -166,14 +163,13 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
@@ -197,44 +193,38 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="disk.cpp" />
- <ClCompile Include="encryption.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\disk.cpp" />
+ <ClCompile Include="src\encryption.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="utf.cpp" />
- <ClCompile Include="wizard.cpp" />
- <ClCompile Include="worker.cpp" />
- <ClCompile Include="aggressive.cpp" />
- <ClCompile Include="contactchain.cpp" />
- <ClCompile Include="eventchain.cpp" />
- <ClCompile Include="finaltasks.cpp" />
- <ClCompile Include="initialchecks.cpp" />
- <ClCompile Include="modulechain.cpp" />
- <ClCompile Include="settingschain.cpp" />
- <ClCompile Include="user.cpp" />
- <ClCompile Include="cleaning.cpp" />
- <ClCompile Include="fileaccess.cpp" />
- <ClCompile Include="finished.cpp" />
- <ClCompile Include="openerror.cpp" />
- <ClCompile Include="progress.cpp" />
- <ClCompile Include="selectdb.cpp" />
- <ClCompile Include="welcome.cpp" />
+ <ClCompile Include="src\utf.cpp" />
+ <ClCompile Include="src\wizard.cpp" />
+ <ClCompile Include="src\worker.cpp" />
+ <ClCompile Include="src\aggressive.cpp" />
+ <ClCompile Include="src\contactchain.cpp" />
+ <ClCompile Include="src\eventchain.cpp" />
+ <ClCompile Include="src\finaltasks.cpp" />
+ <ClCompile Include="src\initialchecks.cpp" />
+ <ClCompile Include="src\modulechain.cpp" />
+ <ClCompile Include="src\settingschain.cpp" />
+ <ClCompile Include="src\user.cpp" />
+ <ClCompile Include="src\cleaning.cpp" />
+ <ClCompile Include="src\fileaccess.cpp" />
+ <ClCompile Include="src\finished.cpp" />
+ <ClCompile Include="src\openerror.cpp" />
+ <ClCompile Include="src\progress.cpp" />
+ <ClCompile Include="src\selectdb.cpp" />
+ <ClCompile Include="src\welcome.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="database.h" />
- <ClInclude Include="dbtool.h" />
- <ClInclude Include="Version.h" />
+ <ClInclude Include="src\database.h" />
+ <ClInclude Include="src\dbtool.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\dbtool.ico" />
- <None Include="res\profileg.ico" />
- <None Include="res\profiler.ico" />
- <None Include="res\profiley.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
- <ResourceCompile Include="Version.rc" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters
index 1c054474cd..d7c4efe5f7 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters
+++ b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters
@@ -21,100 +21,86 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="disk.cpp">
+ <ClCompile Include="src\disk.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="wizard.cpp">
+ <ClCompile Include="src\wizard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="worker.cpp">
+ <ClCompile Include="src\worker.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="aggressive.cpp">
+ <ClCompile Include="src\aggressive.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="contactchain.cpp">
+ <ClCompile Include="src\contactchain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="eventchain.cpp">
+ <ClCompile Include="src\eventchain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="finaltasks.cpp">
+ <ClCompile Include="src\finaltasks.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="initialchecks.cpp">
+ <ClCompile Include="src\initialchecks.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="modulechain.cpp">
+ <ClCompile Include="src\modulechain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="settingschain.cpp">
+ <ClCompile Include="src\settingschain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="user.cpp">
+ <ClCompile Include="src\user.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="cleaning.cpp">
+ <ClCompile Include="src\cleaning.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="fileaccess.cpp">
+ <ClCompile Include="src\fileaccess.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="finished.cpp">
+ <ClCompile Include="src\finished.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="openerror.cpp">
+ <ClCompile Include="src\openerror.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="progress.cpp">
+ <ClCompile Include="src\progress.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="selectdb.cpp">
+ <ClCompile Include="src\selectdb.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="welcome.cpp">
+ <ClCompile Include="src\welcome.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="utf.cpp">
+ <ClCompile Include="src\utf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="encryption.cpp">
+ <ClCompile Include="src\encryption.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="database.h">
+ <ClInclude Include="src\database.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="dbtool.h">
+ <ClInclude Include="src\dbtool.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Version.h">
+ <ClInclude Include="src\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\dbtool.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\profileg.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\profiler.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\profiley.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="Version.rc">
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Dbx_mmap_SA/Dbtool/Version.rc b/plugins/Dbx_mmap_SA/Dbtool/res/Version.rc
index b6ce62273e..f9dd44c219 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/Version.rc
+++ b/plugins/Dbx_mmap_SA/Dbtool/res/Version.rc
@@ -5,7 +5,7 @@
#endif //APSTUDIO_INVOKED
#include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool.exe.manifest b/plugins/Dbx_mmap_SA/Dbtool/res/dbtool.exe.manifest
index 1b6aab686b..1b6aab686b 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/dbtool.exe.manifest
+++ b/plugins/Dbx_mmap_SA/Dbtool/res/dbtool.exe.manifest
diff --git a/plugins/Dbx_mmap_SA/Dbtool/resource.rc b/plugins/Dbx_mmap_SA/Dbtool/res/resource.rc
index 7aa4cba249..25710d5ca8 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/resource.rc
+++ b/plugins/Dbx_mmap_SA/Dbtool/res/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
// Bitmap
//
-IDB_BITMAP1 BITMAP "res\\dbtool.bmp"
+IDB_BITMAP1 BITMAP "dbtool.bmp"
/////////////////////////////////////////////////////////////////////////////
//
@@ -320,7 +320,7 @@ END
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -345,11 +345,11 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_DBTOOL ICON "res\\dbtool.ico"
-IDI_PROFILEGREEN ICON "res\\profileg.ico"
-IDI_PROFILEYELLOW ICON "res\\profiley.ico"
-IDI_PROFILERED ICON "res\\profiler.ico"
-IDI_BAD ICON "res\\delete.ico"
+IDI_DBTOOL ICON "dbtool.ico"
+IDI_PROFILEGREEN ICON "profileg.ico"
+IDI_PROFILEYELLOW ICON "profiley.ico"
+IDI_PROFILERED ICON "profiler.ico"
+IDI_BAD ICON "delete.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Dbx_mmap_SA/Dbtool/Version.h b/plugins/Dbx_mmap_SA/Dbtool/src/Version.h
index 1ee2b8a4cf..1ee2b8a4cf 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/Version.h
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/Version.h
diff --git a/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/aggressive.cpp
index 5ec62707f1..5ec62707f1 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/aggressive.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/cleaning.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/cleaning.cpp
index a16a11e7ac..a16a11e7ac 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/cleaning.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/cleaning.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/contactchain.cpp
index 0452f90d0d..0452f90d0d 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/contactchain.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/database.h b/plugins/Dbx_mmap_SA/Dbtool/src/database.h
index aa73d16362..aa73d16362 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/database.h
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/database.h
diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool.h b/plugins/Dbx_mmap_SA/Dbtool/src/dbtool.h
index dd6af38cd5..7f89ecd7aa 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/dbtool.h
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/dbtool.h
@@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NON_CONFORMING_SWPRINTFS
#include <tchar.h>
diff --git a/plugins/Dbx_mmap_SA/Dbtool/disk.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/disk.cpp
index 1ac84a3dc6..1ac84a3dc6 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/disk.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/disk.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/encryption.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/encryption.cpp
index 1e7b264efa..1e7b264efa 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/encryption.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/encryption.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/eventchain.cpp
index 3c9e37668a..3c9e37668a 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/eventchain.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/fileaccess.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/fileaccess.cpp
index d904daf5b9..d904daf5b9 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/fileaccess.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/fileaccess.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/finaltasks.cpp
index 2ed8b7183d..2ed8b7183d 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/finaltasks.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/finished.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/finished.cpp
index 08d0f5c893..08d0f5c893 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/finished.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/finished.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/initialchecks.cpp
index 385d31cb92..385d31cb92 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/initialchecks.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/main.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/main.cpp
index d505751bd5..d505751bd5 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/main.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/main.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/modulechain.cpp
index 2b91059176..2b91059176 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/modulechain.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/openerror.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/openerror.cpp
index 1fa2964c20..1fa2964c20 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/openerror.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/openerror.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/progress.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/progress.cpp
index 5ddb8bd985..5ddb8bd985 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/progress.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/progress.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/resource.h b/plugins/Dbx_mmap_SA/Dbtool/src/resource.h
index f92176c33f..f92176c33f 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/resource.h
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/resource.h
diff --git a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/selectdb.cpp
index 9db3517816..9db3517816 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/selectdb.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/settingschain.cpp
index a6e7ecab3b..a6e7ecab3b 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/settingschain.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/user.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/user.cpp
index 9922f1630f..9922f1630f 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/user.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/user.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/utf.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/utf.cpp
index c56db053d8..c56db053d8 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/utf.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/utf.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/welcome.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/welcome.cpp
index 291281e70a..291281e70a 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/welcome.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/welcome.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/wizard.cpp
index 8f3a9d5ca8..8f3a9d5ca8 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/wizard.cpp
diff --git a/plugins/Dbx_mmap_SA/Dbtool/worker.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/worker.cpp
index dd73c83947..dd73c83947 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/worker.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/src/worker.cpp