6 files changed, 80 insertions, 17 deletions
diff --git a/plugins/AddContactPlus/Version.h b/plugins/AddContactPlus/Version.h
new file mode 100644
index 0000000000..fa45898d07
--- /dev/null
+++ b/plugins/AddContactPlus/Version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0
+#define __MINOR_VERSION				9
+#define __RELEASE_NUM				9
+#define __BUILD_NUM					0
+
+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
+
+#define __STRINGIFY_IMPL(x)			#x
+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
+
+#define __PLUGIN_NAME				"AddContact+"
+#define __INTERNAL_NAME				"AddContact+"
+#define __FILENAME					"AddContactPlus.dll"
+#define __DESCRIPTION 				"Provides the ability to quickly add new contacts."
+#define __AUTHOR					"Bartosz 'Dezeath' Białek"
+#define __AUTHOREMAIL				"dezred@gmail.com"
+#define __AUTHORWEB					"http://code.google.com/p/dezeath"
+#define __COPYRIGHT					"Š 2007-2012 Bartosz 'Dezeath' Białek"
diff --git a/plugins/AddContactPlus/Version.rc b/plugins/AddContactPlus/Version.rc
new file mode 100644
index 0000000000..e637f0cb33
--- /dev/null
+++ b/plugins/AddContactPlus/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "afxres.h"
+#include "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 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/plugins/AddContactPlus/addcontactplus.h b/plugins/AddContactPlus/addcontactplus.h
index 3ff4114560..6e9d90e9fd 100644
--- a/plugins/AddContactPlus/addcontactplus.h
+++ b/plugins/AddContactPlus/addcontactplus.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <windows.h>
 #include <commctrl.h>
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_system.h>
@@ -45,7 +46,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "m_toolbar.h"
 #include "m_updater.h"
 #include "m_addcontactplus.h"
+
 #include "resource.h"
+#include "version.h"
 
 #define	ICON_ADD "AddContactPlus_Icon"
 
diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj b/plugins/AddContactPlus/addcontactplus_10.vcxproj
index cb20515251..b0733eedcc 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj
@@ -189,12 +189,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="addcontactplus.h" />
+    <ClInclude Include="Version.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="contact_add.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource.rc" />
+    <ResourceCompile Include="Version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters b/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
index 3bb273b79a..b87d889578 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
@@ -26,6 +26,9 @@
     <ClInclude Include="addcontactplus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="contact_add.ico">
@@ -36,5 +39,8 @@
     <ResourceCompile Include="resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="Version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/plugins/AddContactPlus/main.cpp b/plugins/AddContactPlus/main.cpp
index 201da5572f..7d1475d72c 100644
--- a/plugins/AddContactPlus/main.cpp
+++ b/plugins/AddContactPlus/main.cpp
@@ -29,20 +29,14 @@ HANDLE hIconLibItem;
 struct MM_INTERFACE	mmi;
 
 PLUGININFOEX pluginInfo = {
-	sizeof(PLUGININFOEX),
-#if defined(_WIN64)
-	"AddContact+ (x64)",
-#elif defined(_UNICODE)
-	"AddContact+ (Unicode)",
-#else
-	"AddContact+ (ANSI)",
-#endif
-	PLUGIN_MAKE_VERSION(0, 9, 9, 0),
-	"Provides the ability to quickly add new contacts.",
-	"Bartosz 'Dezeath' Białek",
-	"dezred"/*antispam*/"@"/*antispam*/"gmail"/*antispam*/"."/*antispam*/"com",
-	"Š 2007-2011 Bartosz 'Dezeath' Białek",
-	"http://code.google.com/p/dezeath",
+    sizeof(PLUGININFOEX),
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
 	UNICODE_AWARE,
 	0,
 	// {6471D451-2FE0-4ee2-850E-9F84F3C0D187}
@@ -81,7 +75,7 @@ static int OnIconsChanged(WPARAM, LPARAM)
 		return 0;
 
 	mi.cbSize = sizeof(mi);
-	mi.flags = CMIM_ICON | CMIF_ICONFROMICOLIB;
+	mi.flags = CMIM_ICON | CMIF_ICONFROMICOLIB | CMIF_TCHAR;
 	mi.icolibItem = hIconLibItem;
 	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMainMenuItem, (LPARAM)&mi);
 
@@ -112,9 +106,9 @@ static int OnAccListChanged(WPARAM, LPARAM)
 
 		mi.cbSize = sizeof(mi);
 		mi.position = 500020001;
-		mi.flags = CMIF_ICONFROMICOLIB;
+		mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;
 		mi.icolibItem = hIconLibItem;
-		mi.pszName = LPGEN("&Add Contact...");
+		mi.ptszName = LPGENT("&Add Contact...");
 		mi.pszService = MS_ADDCONTACTPLUS_SHOW;
 		hMainMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi);