19 files changed, 32 insertions, 35 deletions
diff --git a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj
index 22cbaeca69..5e19ec66f3 100644
--- a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj
+++ b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj
@@ -82,7 +82,6 @@
       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <StringPooling>false</StringPooling>
     </ClCompile>
     <ResourceCompile>
@@ -114,7 +113,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -147,7 +145,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -182,7 +179,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -203,26 +199,26 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="database.cpp" />
-    <ClCompile Include="dbcache.cpp" />
-    <ClCompile Include="dbcontacts.cpp" />
-    <ClCompile Include="dbevents.cpp" />
-    <ClCompile Include="dbheaders.cpp" />
-    <ClCompile Include="dbintf.cpp" />
-    <ClCompile Include="dbmodulechain.cpp" />
-    <ClCompile Include="dbsettings.cpp" />
-    <ClCompile Include="init.cpp">
+    <ClCompile Include="src\database.cpp" />
+    <ClCompile Include="src\dbcache.cpp" />
+    <ClCompile Include="src\dbcontacts.cpp" />
+    <ClCompile Include="src\dbevents.cpp" />
+    <ClCompile Include="src\dbheaders.cpp" />
+    <ClCompile Include="src\dbintf.cpp" />
+    <ClCompile Include="src\dbmodulechain.cpp" />
+    <ClCompile Include="src\dbsettings.cpp" />
+    <ClCompile Include="src\init.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="database.h" />
-    <ClInclude Include="dbintf.h" />
+    <ClInclude Include="src\commonheaders.h" />
+    <ClInclude Include="src\database.h" />
+    <ClInclude Include="src\dbintf.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="db3x_mmap.rc" />
-    <ResourceCompile Include="version.rc" />
+    <ResourceCompile Include="res\db3x_mmap.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters
index 2f8143f35e..a087e1d883 100644
--- a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters
+++ b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters
@@ -15,50 +15,50 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="database.cpp">
+    <ClCompile Include="src\database.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbcache.cpp">
+    <ClCompile Include="src\dbcache.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbcontacts.cpp">
+    <ClCompile Include="src\dbcontacts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbevents.cpp">
+    <ClCompile Include="src\dbevents.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbheaders.cpp">
+    <ClCompile Include="src\dbheaders.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbmodulechain.cpp">
+    <ClCompile Include="src\dbmodulechain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbsettings.cpp">
+    <ClCompile Include="src\dbsettings.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="init.cpp">
+    <ClCompile Include="src\init.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbintf.cpp">
+    <ClCompile Include="src\dbintf.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h">
+    <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="database.h">
+    <ClInclude Include="src\database.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dbintf.h">
+    <ClInclude Include="src\dbintf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="db3x_mmap.rc">
+    <ResourceCompile Include="res\db3x_mmap.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/Db3x_mmap/db3x_mmap-translation.txt b/plugins/Db3x_mmap/docs/db3x_mmap-translation.txt
index cd23ce15ba..cd23ce15ba 100644
--- a/plugins/Db3x_mmap/db3x_mmap-translation.txt
+++ b/plugins/Db3x_mmap/docs/db3x_mmap-translation.txt
diff --git a/plugins/Db3x_mmap/db3x_mmap.rc b/plugins/Db3x_mmap/res/db3x_mmap.rc
index 434e5437b5..9c2727f53b 100644
--- a/plugins/Db3x_mmap/db3x_mmap.rc
+++ b/plugins/Db3x_mmap/res/db3x_mmap.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -142,7 +142,7 @@ END
 
 1 TEXTINCLUDE
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE
diff --git a/plugins/Db3x_mmap/version.rc b/plugins/Db3x_mmap/res/version.rc
index 21a71416b5..d49f35ded0 100644
--- a/plugins/Db3x_mmap/version.rc
+++ b/plugins/Db3x_mmap/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/Db3x_mmap/commonheaders.h b/plugins/Db3x_mmap/src/commonheaders.h
index 4a31de1cc2..ea615956e1 100644
--- a/plugins/Db3x_mmap/commonheaders.h
+++ b/plugins/Db3x_mmap/src/commonheaders.h
@@ -21,6 +21,7 @@ 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 _WIN32_WINNT 0x0501
 
 #include "m_stdhdr.h"
diff --git a/plugins/Db3x_mmap/database.cpp b/plugins/Db3x_mmap/src/database.cpp
index 1962805a35..1962805a35 100644
--- a/plugins/Db3x_mmap/database.cpp
+++ b/plugins/Db3x_mmap/src/database.cpp
diff --git a/plugins/Db3x_mmap/database.h b/plugins/Db3x_mmap/src/database.h
index 83c2fcaea9..83c2fcaea9 100644
--- a/plugins/Db3x_mmap/database.h
+++ b/plugins/Db3x_mmap/src/database.h
diff --git a/plugins/Db3x_mmap/dbcache.cpp b/plugins/Db3x_mmap/src/dbcache.cpp
index 466aa7a00d..466aa7a00d 100644
--- a/plugins/Db3x_mmap/dbcache.cpp
+++ b/plugins/Db3x_mmap/src/dbcache.cpp
diff --git a/plugins/Db3x_mmap/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp
index b8d4a843b8..b8d4a843b8 100644
--- a/plugins/Db3x_mmap/dbcontacts.cpp
+++ b/plugins/Db3x_mmap/src/dbcontacts.cpp
diff --git a/plugins/Db3x_mmap/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp
index 917d1680b2..917d1680b2 100644
--- a/plugins/Db3x_mmap/dbevents.cpp
+++ b/plugins/Db3x_mmap/src/dbevents.cpp
diff --git a/plugins/Db3x_mmap/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp
index 3d18a373fa..3d18a373fa 100644
--- a/plugins/Db3x_mmap/dbheaders.cpp
+++ b/plugins/Db3x_mmap/src/dbheaders.cpp
diff --git a/plugins/Db3x_mmap/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp
index 83ae3aa4ca..83ae3aa4ca 100644
--- a/plugins/Db3x_mmap/dbintf.cpp
+++ b/plugins/Db3x_mmap/src/dbintf.cpp
diff --git a/plugins/Db3x_mmap/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 4dff427516..4dff427516 100644
--- a/plugins/Db3x_mmap/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
diff --git a/plugins/Db3x_mmap/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp
index f8b25ef879..f8b25ef879 100644
--- a/plugins/Db3x_mmap/dbmodulechain.cpp
+++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp
diff --git a/plugins/Db3x_mmap/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp
index 49ac018047..49ac018047 100644
--- a/plugins/Db3x_mmap/dbsettings.cpp
+++ b/plugins/Db3x_mmap/src/dbsettings.cpp
diff --git a/plugins/Db3x_mmap/init.cpp b/plugins/Db3x_mmap/src/init.cpp
index b38fab0ce2..b38fab0ce2 100644
--- a/plugins/Db3x_mmap/init.cpp
+++ b/plugins/Db3x_mmap/src/init.cpp
diff --git a/plugins/Db3x_mmap/resource.h b/plugins/Db3x_mmap/src/resource.h
index 96abbfff99..96abbfff99 100644
--- a/plugins/Db3x_mmap/resource.h
+++ b/plugins/Db3x_mmap/src/resource.h
diff --git a/plugins/Db3x_mmap/version.h b/plugins/Db3x_mmap/src/version.h
index 2d10138fcf..2d10138fcf 100644
--- a/plugins/Db3x_mmap/version.h
+++ b/plugins/Db3x_mmap/src/version.h