25 files changed, 63 insertions, 64 deletions
diff --git a/plugins/CrashDumper/crshdmp_10.vcxproj b/plugins/CrashDumper/crshdmp_10.vcxproj
index b074fccf24..6ab4a005c3 100644
--- a/plugins/CrashDumper/crshdmp_10.vcxproj
+++ b/plugins/CrashDumper/crshdmp_10.vcxproj
@@ -187,32 +187,25 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="bkstring.cpp" />
-    <ClCompile Include="crshdmp.cpp" />
-    <ClCompile Include="crshdmp_icons.cpp" />
-    <ClCompile Include="dumper.cpp" />
-    <ClCompile Include="exhndlr.cpp" />
-    <ClCompile Include="ui.cpp" />
-    <ClCompile Include="upload.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\bkstring.cpp" />
+    <ClCompile Include="src\crshdmp.cpp" />
+    <ClCompile Include="src\crshdmp_icons.cpp" />
+    <ClCompile Include="src\dumper.cpp" />
+    <ClCompile Include="src\exhndlr.cpp" />
+    <ClCompile Include="src\ui.cpp" />
+    <ClCompile Include="src\upload.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="bkstring.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="sdkstuff.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\bkstring.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\sdkstuff.h" />
+    <ClInclude Include="src\utils.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="crshdmp.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Vi show.ico" />
-    <None Include="Vi to clipboard.ico" />
-    <None Include="Vi to file.ico" />
-    <None Include="Vi upload.ico" />
-    <None Include="Vi.ico" />
-    <None Include="crshdmp_readme.txt" />
+    <ResourceCompile Include="res\crshdmp.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/CrashDumper/crshdmp_readme.txt b/plugins/CrashDumper/docs/crshdmp_readme.txt
index f4e1ff92ac..f4e1ff92ac 100644
--- a/plugins/CrashDumper/crshdmp_readme.txt
+++ b/plugins/CrashDumper/docs/crshdmp_readme.txt
diff --git a/plugins/CrashDumper/svc_crshdmp-translation.txt b/plugins/CrashDumper/docs/svc_crshdmp-translation.txt
index 18d251f699..18d251f699 100644
--- a/plugins/CrashDumper/svc_crshdmp-translation.txt
+++ b/plugins/CrashDumper/docs/svc_crshdmp-translation.txt
diff --git a/plugins/CrashDumper/res/Version.rc b/plugins/CrashDumper/res/Version.rc
new file mode 100644
index 0000000000..c3c4f27aa3
--- /dev/null
+++ b/plugins/CrashDumper/res/Version.rc
@@ -0,0 +1,45 @@
+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "afxres.h"
+#include "..\src\version.h"
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#endif //_WIN32
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Boris Krasnovskiy"
+            VALUE "FileDescription", "Crash Dumper plugin for Miranda IM."
+            VALUE "FileVersion", __VERSION_STRING
+            VALUE "InternalName", "svc_crshdmp"
+            VALUE "LegalCopyright", "Copyright� 2008 - 2012 Boris Krasnovskiy All Rights Reserved"
+            VALUE "OriginalFilename", "svc_crshdmp.dll"
+            VALUE "ProductName", "Crash Dumper"
+            VALUE "ProductVersion", __VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/plugins/CrashDumper/Vi show.ico b/plugins/CrashDumper/res/Vi show.ico
index 55556862f3..55556862f3 100644
--- a/plugins/CrashDumper/Vi show.ico
+++ b/plugins/CrashDumper/res/Vi show.ico
diff --git a/plugins/CrashDumper/Vi to clipboard.ico b/plugins/CrashDumper/res/Vi to clipboard.ico
index 6f095b59b1..6f095b59b1 100644
--- a/plugins/CrashDumper/Vi to clipboard.ico
+++ b/plugins/CrashDumper/res/Vi to clipboard.ico
diff --git a/plugins/CrashDumper/Vi to file.ico b/plugins/CrashDumper/res/Vi to file.ico
index abfc196437..abfc196437 100644
--- a/plugins/CrashDumper/Vi to file.ico
+++ b/plugins/CrashDumper/res/Vi to file.ico
diff --git a/plugins/CrashDumper/Vi upload.ico b/plugins/CrashDumper/res/Vi upload.ico
index 4c562b02b8..4c562b02b8 100644
--- a/plugins/CrashDumper/Vi upload.ico
+++ b/plugins/CrashDumper/res/Vi upload.ico
diff --git a/plugins/CrashDumper/Vi.ico b/plugins/CrashDumper/res/Vi.ico
index 371aeb345e..371aeb345e 100644
--- a/plugins/CrashDumper/Vi.ico
+++ b/plugins/CrashDumper/res/Vi.ico
diff --git a/plugins/CrashDumper/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc
index ca4c05bbb3..5b5e024260 100644
--- a/plugins/CrashDumper/crshdmp.rc
+++ b/plugins/CrashDumper/res/crshdmp.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -9,7 +9,6 @@
 //
 #include "afxres.h"
 #include "richedit.h"
-#include "version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -38,7 +37,6 @@ END
 BEGIN
     "#include ""afxres.h""\r\n"
     "#include ""richedit.h""\r\n"
-    "#include ""version.h""\r\0"
 END
 
 3 TEXTINCLUDE 
@@ -128,45 +126,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Boris Krasnovskiy"
-            VALUE "FileDescription", "Crash Dumper plugin for Miranda IM "
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "InternalName", "svc_crshdmp"
-            VALUE "LegalCopyright", "Copyright� 2008 - 2012 Boris Krasnovskiy All Rights Reserved"
-            VALUE "OriginalFilename", "svc_crshdmp.dll"
-            VALUE "ProductName", "Crash Dumper"
-            VALUE "ProductVersion", __VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Icon
 //
 
diff --git a/plugins/CrashDumper/bkstring.cpp b/plugins/CrashDumper/src/bkstring.cpp
index 418cb0bd83..418cb0bd83 100644
--- a/plugins/CrashDumper/bkstring.cpp
+++ b/plugins/CrashDumper/src/bkstring.cpp
diff --git a/plugins/CrashDumper/bkstring.h b/plugins/CrashDumper/src/bkstring.h
index a546bb8bc8..88cb3bdfc4 100644
--- a/plugins/CrashDumper/bkstring.h
+++ b/plugins/CrashDumper/src/bkstring.h
@@ -16,6 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define _CRT_SECURE_NO_WARNINGS
+
 #ifndef _BKSTRING_H_
 #define _BKSTRING_H_
 
diff --git a/plugins/CrashDumper/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index 72ffac7f44..72ffac7f44 100644
--- a/plugins/CrashDumper/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
diff --git a/plugins/CrashDumper/crshdmp_icons.cpp b/plugins/CrashDumper/src/crshdmp_icons.cpp
index 1f7106303f..1f7106303f 100644
--- a/plugins/CrashDumper/crshdmp_icons.cpp
+++ b/plugins/CrashDumper/src/crshdmp_icons.cpp
diff --git a/plugins/CrashDumper/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp
index bae091a023..bae091a023 100644
--- a/plugins/CrashDumper/dumper.cpp
+++ b/plugins/CrashDumper/src/dumper.cpp
diff --git a/plugins/CrashDumper/exhndlr.cpp b/plugins/CrashDumper/src/exhndlr.cpp
index 93406efaa8..93406efaa8 100644
--- a/plugins/CrashDumper/exhndlr.cpp
+++ b/plugins/CrashDumper/src/exhndlr.cpp
diff --git a/plugins/CrashDumper/resource.h b/plugins/CrashDumper/src/resource.h
index 83d8a491e4..83d8a491e4 100644
--- a/plugins/CrashDumper/resource.h
+++ b/plugins/CrashDumper/src/resource.h
diff --git a/plugins/CrashDumper/sdkstuff.h b/plugins/CrashDumper/src/sdkstuff.h
index 536a00bc40..536a00bc40 100644
--- a/plugins/CrashDumper/sdkstuff.h
+++ b/plugins/CrashDumper/src/sdkstuff.h
diff --git a/plugins/CrashDumper/ui.cpp b/plugins/CrashDumper/src/ui.cpp
index 00cf9c26cd..00cf9c26cd 100644
--- a/plugins/CrashDumper/ui.cpp
+++ b/plugins/CrashDumper/src/ui.cpp
diff --git a/plugins/CrashDumper/upload.cpp b/plugins/CrashDumper/src/upload.cpp
index 498b5cb2f6..498b5cb2f6 100644
--- a/plugins/CrashDumper/upload.cpp
+++ b/plugins/CrashDumper/src/upload.cpp
diff --git a/plugins/CrashDumper/utils.cpp b/plugins/CrashDumper/src/utils.cpp
index d4dced7d70..d4dced7d70 100644
--- a/plugins/CrashDumper/utils.cpp
+++ b/plugins/CrashDumper/src/utils.cpp
diff --git a/plugins/CrashDumper/utils.h b/plugins/CrashDumper/src/utils.h
index 9089f57571..9089f57571 100644
--- a/plugins/CrashDumper/utils.h
+++ b/plugins/CrashDumper/src/utils.h
diff --git a/plugins/CrashDumper/vc6/dbghelp.h b/plugins/CrashDumper/src/vc6/dbghelp.h
index d8a713060b..d8a713060b 100644
--- a/plugins/CrashDumper/vc6/dbghelp.h
+++ b/plugins/CrashDumper/src/vc6/dbghelp.h
diff --git a/plugins/CrashDumper/vc6/dbghelp.lib b/plugins/CrashDumper/src/vc6/dbghelp.lib
index 5d50c3f74d..5d50c3f74d 100644
--- a/plugins/CrashDumper/vc6/dbghelp.lib
+++ b/plugins/CrashDumper/src/vc6/dbghelp.lib
diff --git a/plugins/CrashDumper/version.h b/plugins/CrashDumper/src/version.h
index 776e30e404..776e30e404 100644
--- a/plugins/CrashDumper/version.h
+++ b/plugins/CrashDumper/src/version.h