version info standartization

git-svn-id: http://svn.miranda-ng.org/main/trunk@1989 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

28 files changed, 29 insertions, 242 deletions

diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj b/plugins/AddContactPlus/addcontactplus_10.vcxproj
index cd65cabe0e..1795c4fbe1 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj
@@ -195,9 +195,6 @@
     <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\contact_add.ico" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

     <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters b/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
index 2c8993df28..90a34ca6bd 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
@@ -31,11 +31,6 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\contact_add.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

diff --git a/plugins/AddContactPlus/res/Version.rc b/plugins/AddContactPlus/res/Version.rc
index d741488c4f..cee33c8390 100644
--- a/plugins/AddContactPlus/res/Version.rc
+++ b/plugins/AddContactPlus/res/Version.rc
@@ -4,13 +4,8 @@
 #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

diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp
index d4bc5304ad..23d349ade8 100644
--- a/plugins/AddContactPlus/src/main.cpp
+++ b/plugins/AddContactPlus/src/main.cpp
@@ -38,7 +38,7 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {6471D451-2FE0-4ee2-850E-9F84F3C0D187}

-	{ 0x6471d451, 0x2fe0, 0x4ee2, { 0x85, 0xe, 0x9f, 0x84, 0xf3, 0xc0, 0xd1, 0x87 } }

+	{0x6471d451, 0x2fe0, 0x4ee2, {0x85, 0xe, 0x9f, 0x84, 0xf3, 0xc0, 0xd1, 0x87}}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

diff --git a/plugins/Alarms/alarms_10.vcxproj b/plugins/Alarms/alarms_10.vcxproj
index 0d3cfd19e3..4ff977a54d 100644
--- a/plugins/Alarms/alarms_10.vcxproj
+++ b/plugins/Alarms/alarms_10.vcxproj
@@ -203,13 +203,6 @@
     <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\clock.ico" />

-    <None Include="res\green.ico" />

-    <None Include="res\iconttbdown.ico" />

-    <None Include="res\iconttbup.ico" />

-    <None Include="res\yellow.ico" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

     <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

diff --git a/plugins/Alarms/alarms_10.vcxproj.filters b/plugins/Alarms/alarms_10.vcxproj.filters
index 8f6b010b84..10ac18cd42 100644
--- a/plugins/Alarms/alarms_10.vcxproj.filters
+++ b/plugins/Alarms/alarms_10.vcxproj.filters
@@ -76,23 +76,6 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\clock.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\green.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\iconttbdown.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\iconttbup.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\yellow.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

diff --git a/plugins/Alarms/res/Version.rc b/plugins/Alarms/res/Version.rc
index d741488c4f..cee33c8390 100644
--- a/plugins/Alarms/res/Version.rc
+++ b/plugins/Alarms/res/Version.rc
@@ -4,13 +4,8 @@
 #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

diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp
index 1ead2639e2..c8a9a6c4fe 100644
--- a/plugins/Alarms/src/alarms.cpp
+++ b/plugins/Alarms/src/alarms.cpp
@@ -29,7 +29,7 @@ typedef LRESULT (CALLBACK *WNDPROC)(HWND, UINT, WPARAM, LPARAM);
 //bool right_window = false;

 WNDPROC old_clist_wndproc;

 

-PLUGININFOEX pluginInfo={

+PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -39,7 +39,8 @@ PLUGININFOEX pluginInfo={
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	{ 0x4dd7762b, 0xd612, 0x4f84, { 0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d } } // {4DD7762B-D612-4f84-AA86-068F17859B6D}

+	// {4DD7762B-D612-4f84-AA86-068F17859B6D}

+	{0x4dd7762b, 0xd612, 0x4f84, {0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d}}

 };

 

 extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

diff --git a/plugins/AssocMgr/assocmgr.vcxproj b/plugins/AssocMgr/assocmgr.vcxproj
index 1e478e249a..d20895a389 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj
+++ b/plugins/AssocMgr/assocmgr.vcxproj
@@ -209,17 +209,8 @@
     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="res\miranda.ico" />

-    <CustomBuild Include="res\mirandafile.ico" />

-    <CustomBuild Include="docs\AssocMgr-Developer.txt" />

-    <CustomBuild Include="docs\AssocMgr-License.txt" />

-    <CustomBuild Include="docs\AssocMgr-Readme.txt" />

-    <CustomBuild Include="docs\AssocMgr-Translation.txt" />

-    <CustomBuild Include="docs\Info_Src.txt" />

-    <CustomBuild Include="docs\License_Appendix.txt" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

+    <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/AssocMgr/assocmgr.vcxproj.filters b/plugins/AssocMgr/assocmgr.vcxproj.filters
index 85dfe0caf0..6d23c19728 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj.filters
+++ b/plugins/AssocMgr/assocmgr.vcxproj.filters
@@ -13,10 +13,6 @@
       <UniqueIdentifier>{db2d32fd-f303-490e-bc40-ca67fd6fee73}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Documentation">

-      <UniqueIdentifier>{6f8e30e0-bc03-46e7-b039-e0fbd019afb2}</UniqueIdentifier>

-      <Extensions>txt</Extensions>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\assoclist.cpp">

@@ -58,41 +54,18 @@
       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\resource.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\version.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="res\miranda.ico">

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\mirandafile.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-Developer.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-License.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-Readme.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\AssocMgr-Translation.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Info_Src.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\License_Appendix.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/AssocMgr/res/resource.rc b/plugins/AssocMgr/res/resource.rc
index 3c878d0540..ca7262ebf9 100644
--- a/plugins/AssocMgr/res/resource.rc
+++ b/plugins/AssocMgr/res/resource.rc
@@ -95,17 +95,4 @@ END
 #endif    // APSTUDIO_INVOKED

 

 #endif    // Englisch (GB) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-#include "version.rc"

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

+/////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/plugins/AssocMgr/res/version.rc b/plugins/AssocMgr/res/version.rc
index b8fb57b0de..cee33c8390 100644
--- a/plugins/AssocMgr/res/version.rc
+++ b/plugins/AssocMgr/res/version.rc
@@ -1,14 +1,11 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

 #include "..\src\version.h"

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp
index fdb9e09a61..4af0e5c6e0 100644
--- a/plugins/AssocMgr/src/main.cpp
+++ b/plugins/AssocMgr/src/main.cpp
@@ -26,7 +26,7 @@ HINSTANCE hInst;
 static HANDLE hHookModulesLoaded;

 int hLangpack;

 

-PLUGININFOEX pluginInfo={

+PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -37,7 +37,7 @@ PLUGININFOEX pluginInfo={
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {52685CD7-0EC7-44c1-A1A6-381612418202}

-	{0x52685cd7,0xec7,0x44c1,{0xa1,0xa6,0x38,0x16,0x12,0x41,0x82,0x2}}

+	{0x52685cd7, 0xec7, 0x44c1, {0xa1, 0xa6, 0x38, 0x16, 0x12, 0x41, 0x82, 0x2}}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

diff --git a/plugins/AuthState/authstate_10.vcxproj b/plugins/AuthState/authstate_10.vcxproj
index d2e450faac..7cc4060a33 100644
--- a/plugins/AuthState/authstate_10.vcxproj
+++ b/plugins/AuthState/authstate_10.vcxproj
@@ -186,13 +186,6 @@
     <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\auth.ico" />

-    <None Include="res\authgrant.ico" />

-    <None Include="res\grant.ico" />

-    <None Include="docs\authstate-readme.txt" />

-    <None Include="docs\authstate-translation.txt" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\authstate.rc" />

     <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

diff --git a/plugins/AuthState/authstate_10.vcxproj.filters b/plugins/AuthState/authstate_10.vcxproj.filters
index 72395ac048..102c9142b2 100644
--- a/plugins/AuthState/authstate_10.vcxproj.filters
+++ b/plugins/AuthState/authstate_10.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

     </Filter>

-    <Filter Include="Docs">

-      <UniqueIdentifier>{e3d2bfb3-bac6-4574-951a-0d849c44446e}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\main.cpp">

@@ -37,23 +34,6 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\auth.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\authgrant.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\grant.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="docs\authstate-readme.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="docs\authstate-translation.txt">

-      <Filter>Docs</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\authstate.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

diff --git a/plugins/AuthState/res/version.rc b/plugins/AuthState/res/version.rc
index 770f6ff8f2..cee33c8390 100644
--- a/plugins/AuthState/res/version.rc
+++ b/plugins/AuthState/res/version.rc
@@ -4,13 +4,8 @@
 #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

@@ -29,12 +24,10 @@ BEGIN
         BLOCK "000004b0"

         BEGIN

             VALUE "FileDescription", __DESCRIPTION

-            VALUE "FileVersion", __FILEVERSION_DOTS

             VALUE "InternalName", __PLUGIN_NAME

             VALUE "LegalCopyright", __COPYRIGHT

             VALUE "OriginalFilename", __FILENAME

             VALUE "ProductName", __PLUGIN_NAME

-            VALUE "ProductVersion", __FILEVERSION_DOTS

         END

     END

     BLOCK "VarFileInfo"

diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp
index 6e8bcdb99a..1816375e16 100644
--- a/plugins/AuthState/src/main.cpp
+++ b/plugins/AuthState/src/main.cpp
@@ -47,7 +47,7 @@ icon_grant,
 icon_both

 };

 

-PLUGININFOEX pluginInfo={

+PLUGININFOEX pluginInfo = {

     sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -56,9 +56,9 @@ PLUGININFOEX pluginInfo={
 	__AUTHOREMAIL,

 	__COPYRIGHT,

 	__AUTHORWEB,

-	UNICODE_AWARE, //doesn't replace anything built-in

+	UNICODE_AWARE,

+	// {DACE7D41-DFA9-4772-89AE-A59A6153E6B2}

 	{0xdace7d41, 0xdfa9, 0x4772, {0x89, 0xae, 0xa5, 0x9a, 0x61, 0x53, 0xe6, 0xb2}}

-/* DACE7D41-DFA9-4772-89AE-A59A6153E6B2 */

 };

 

 extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

diff --git a/plugins/AutoRun/res/Version.rc b/plugins/AutoRun/res/Version.rc
index d741488c4f..cee33c8390 100644
--- a/plugins/AutoRun/res/Version.rc
+++ b/plugins/AutoRun/res/Version.rc
@@ -4,13 +4,8 @@
 #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

diff --git a/plugins/AutoRun/src/autorun.h b/plugins/AutoRun/src/autorun.h
index 36d951cff0..14df1c4349 100644
--- a/plugins/AutoRun/src/autorun.h
+++ b/plugins/AutoRun/src/autorun.h
@@ -15,10 +15,4 @@
 #define SUB_KEY _T("Software\\Microsoft\\Windows\\CurrentVersion\\Run")

 #define ModuleName "Autorun"

 

-// Plugin UUID for New plugin loader

-// req. 0.7.18+ core

-// {EB0465E2-CEEE-11DB-83EF-C1BF55D89593}

-

-#define MIID_AUTORUN  {0xeb0465e2, 0xceee, 0x11db, { 0x83, 0xef, 0xc1, 0xbf, 0x55, 0xd8, 0x95, 0x93}}

-

 HKEY ROOT_KEY = HKEY_CURRENT_USER;

diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp
index da5b605fc1..aeecf0e08d 100644
--- a/plugins/AutoRun/src/main.cpp
+++ b/plugins/AutoRun/src/main.cpp
@@ -3,8 +3,7 @@
 HINSTANCE hInst;

 int hLangpack;

 

-PLUGININFOEX pluginInfoEx=

-{ 	// about plugin

+PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -14,7 +13,8 @@ PLUGININFOEX pluginInfoEx=
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	MIID_AUTORUN

+	// {EB0465E2-CEEE-11DB-83EF-C1BF55D89593}

+	{0xeb0465e2, 0xceee, 0x11db, {0x83, 0xef, 0xc1, 0xbf, 0x55, 0xd8, 0x95, 0x93}}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

diff --git a/plugins/AutoShutdown/res/version.rc b/plugins/AutoShutdown/res/version.rc
index a141cc3aa7..cee33c8390 100644
--- a/plugins/AutoShutdown/res/version.rc
+++ b/plugins/AutoShutdown/res/version.rc
@@ -1,15 +1,11 @@
+// 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"

 

-///////////////////////////////////////////////////////////////////////////// 

-//                                                                            

-// Version                                                                    

-//                                                                            

-                                                                              

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

diff --git a/plugins/AutoShutdown/shutdown.vcxproj b/plugins/AutoShutdown/shutdown.vcxproj
index f3a1116d27..b45aab88bf 100644
--- a/plugins/AutoShutdown/shutdown.vcxproj
+++ b/plugins/AutoShutdown/shutdown.vcxproj
@@ -212,17 +212,6 @@
     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="res\active.ico" />

-    <CustomBuild Include="res\header.ico" />

-    <CustomBuild Include="res\inactive.ico" />

-    <CustomBuild Include="docs\Shutdown-Developer.txt" />

-    <CustomBuild Include="docs\Shutdown-License.txt" />

-    <CustomBuild Include="docs\Shutdown-Readme.txt" />

-    <CustomBuild Include="docs\Shutdown-Translation.txt" />

-    <CustomBuild Include="docs\Info_Src.txt" />

-    <CustomBuild Include="docs\License_Appendix.txt" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

     <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

diff --git a/plugins/AutoShutdown/shutdown.vcxproj.filters b/plugins/AutoShutdown/shutdown.vcxproj.filters
index 52b2e5ecfe..f769086cdd 100644
--- a/plugins/AutoShutdown/shutdown.vcxproj.filters
+++ b/plugins/AutoShutdown/shutdown.vcxproj.filters
@@ -13,10 +13,6 @@
       <UniqueIdentifier>{6fa287d2-ba8a-43ba-9cff-72ad37c5d522}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Documentation">

-      <UniqueIdentifier>{616559cd-4d97-4708-949b-89d8e3778330}</UniqueIdentifier>

-      <Extensions>txt</Extensions>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\cpuusage.cpp">

@@ -70,10 +66,10 @@
       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\resource.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\version.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

@@ -84,33 +80,4 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="res\active.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\header.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\inactive.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Shutdown-Developer.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Shutdown-License.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Shutdown-Readme.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Shutdown-Translation.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\Info_Src.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\License_Appendix.txt">

-      <Filter>Documentation</Filter>

-    </CustomBuild>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/AutoShutdown/src/main.cpp b/plugins/AutoShutdown/src/main.cpp
index c5829eee42..c81b86a0b8 100644
--- a/plugins/AutoShutdown/src/main.cpp
+++ b/plugins/AutoShutdown/src/main.cpp
@@ -25,7 +25,7 @@ static HANDLE hHookModulesLoaded;
 HANDLE hActiveIcon,hInactiveIcon;

 int hLangpack;

 

-PLUGININFOEX pluginInfo={

+PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -36,7 +36,7 @@ PLUGININFOEX pluginInfo={
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {9DE24579-5C5C-49aa-80E8-4D38E4344E63}

-	{0x9de24579,0x5c5c,0x49aa,{0x80,0xe8,0x4d,0x38,0xe4,0x34,0x4e,0x63}},

+	{0x9de24579, 0x5c5c, 0x49aa, {0x80, 0xe8, 0x4d, 0x38, 0xe4, 0x34, 0x4e, 0x63}}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, VOID *pReserved)

diff --git a/plugins/AvatarHistory/AvatarHistory.vcxproj b/plugins/AvatarHistory/AvatarHistory.vcxproj
index 06fd3a4715..7923438ec3 100644
--- a/plugins/AvatarHistory/AvatarHistory.vcxproj
+++ b/plugins/AvatarHistory/AvatarHistory.vcxproj
@@ -208,12 +208,6 @@
     <ResourceCompile Include="res\AvatarHistory.rc" />

     <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="docs\avatarhist_changelog.txt" />

-    <CustomBuild Include="docs\avatarhist_readme.txt" />

-    <CustomBuild Include="docs\avatarhist_version.txt" />

-    <CustomBuild Include="docs\langpack_avatarhist.txt" />

-  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/plugins/AvatarHistory/AvatarHistory.vcxproj.filters b/plugins/AvatarHistory/AvatarHistory.vcxproj.filters
index 9203e75da6..f416979a19 100644
--- a/plugins/AvatarHistory/AvatarHistory.vcxproj.filters
+++ b/plugins/AvatarHistory/AvatarHistory.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{6ad471fb-470c-4466-b817-ec90cb51260c}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Docs">

-      <UniqueIdentifier>{72021e6b-0e9b-4cf3-b35f-db87ed4f6541}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\AvatarDlg.cpp">

@@ -68,18 +65,4 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="docs\avatarhist_changelog.txt">

-      <Filter>Docs</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\avatarhist_readme.txt">

-      <Filter>Docs</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\avatarhist_version.txt">

-      <Filter>Docs</Filter>

-    </CustomBuild>

-    <CustomBuild Include="docs\langpack_avatarhist.txt">

-      <Filter>Docs</Filter>

-    </CustomBuild>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/AvatarHistory/res/Version.rc b/plugins/AvatarHistory/res/Version.rc
index d741488c4f..cee33c8390 100644
--- a/plugins/AvatarHistory/res/Version.rc
+++ b/plugins/AvatarHistory/res/Version.rc
@@ -4,13 +4,8 @@
 #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

diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp
index a49fa28786..9c8c162136 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.cpp
+++ b/plugins/AvatarHistory/src/AvatarHistory.cpp
@@ -58,7 +58,7 @@ static INT_PTR GetCachedAvatar(WPARAM wParam, LPARAM lParam);
 TCHAR * GetCachedAvatar(char *proto, TCHAR *hash);
 BOOL CreateShortcut(TCHAR *file, TCHAR *shortcut);
 
-PLUGININFOEX pluginInfo={
+PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -68,7 +68,8 @@ PLUGININFOEX pluginInfo={
 	__COPYRIGHT,
 	__AUTHORWEB,
 	UNICODE_AWARE,
-	{ 0xdbe8c990, 0x7aa0, 0x458d, { 0xba, 0xb7, 0x33, 0xeb, 0x7, 0x23, 0x8e, 0x71 } } // {DBE8C990-7AA0-458d-BAB7-33EB07238E71}
+	// {DBE8C990-7AA0-458d-BAB7-33EB07238E71}
+	{0xdbe8c990, 0x7aa0, 0x458d, {0xba, 0xb7, 0x33, 0xeb, 0x7, 0x23, 0x8e, 0x71}}
 };
 
 extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)