diff options
-rw-r--r-- | plugins/FlashAvatars/FlashAvatars_10.vcxproj | 2 | ||||
-rw-r--r-- | plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters | 21 | ||||
-rw-r--r-- | plugins/FlashAvatars/FlashAvatars_11.vcxproj | 2 | ||||
-rw-r--r-- | plugins/FlashAvatars/FlashAvatars_11.vcxproj.filters | 21 | ||||
-rw-r--r-- | plugins/FlashAvatars/res/Version.rc | 38 | ||||
-rw-r--r-- | plugins/FlashAvatars/src/TigerHash.cpp | 1 | ||||
-rw-r--r-- | plugins/FlashAvatars/src/TigerHash.h | 2 | ||||
-rw-r--r-- | plugins/FlashAvatars/src/Version.h | 14 | ||||
-rw-r--r-- | plugins/FlashAvatars/src/cflash.cpp | 51 | ||||
-rw-r--r-- | plugins/FlashAvatars/src/stdafx.h | 22 |
10 files changed, 123 insertions, 51 deletions
diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj b/plugins/FlashAvatars/FlashAvatars_10.vcxproj index 50c2ea222a..f1d4daf5f1 100644 --- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj +++ b/plugins/FlashAvatars/FlashAvatars_10.vcxproj @@ -188,9 +188,11 @@ <ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
<ClInclude Include="src\TigerHash.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\FlashAvatars.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\stdafx.cpp">
diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters b/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters index 04d05afcb8..84595578e0 100644 --- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters +++ b/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters @@ -9,6 +9,9 @@ <UniqueIdentifier>{a22eadc9-ed9b-4e56-8e1e-350ce8875bef}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{e502d69e-3182-4849-8a80-09df8b3f5ce5}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\criticalsection.h">
@@ -23,15 +26,27 @@ <ClInclude Include="src\TigerHash.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\FlashAvatars.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\cflash.cpp" />
- <ClCompile Include="src\stdafx.cpp" />
- <ClCompile Include="src\TigerHash.cpp" />
+ <ClCompile Include="src\cflash.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\TigerHash.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/FlashAvatars/FlashAvatars_11.vcxproj b/plugins/FlashAvatars/FlashAvatars_11.vcxproj index b346f7230c..156b0100f4 100644 --- a/plugins/FlashAvatars/FlashAvatars_11.vcxproj +++ b/plugins/FlashAvatars/FlashAvatars_11.vcxproj @@ -192,9 +192,11 @@ <ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
<ClInclude Include="src\TigerHash.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\FlashAvatars.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\stdafx.cpp">
diff --git a/plugins/FlashAvatars/FlashAvatars_11.vcxproj.filters b/plugins/FlashAvatars/FlashAvatars_11.vcxproj.filters index 04d05afcb8..84595578e0 100644 --- a/plugins/FlashAvatars/FlashAvatars_11.vcxproj.filters +++ b/plugins/FlashAvatars/FlashAvatars_11.vcxproj.filters @@ -9,6 +9,9 @@ <UniqueIdentifier>{a22eadc9-ed9b-4e56-8e1e-350ce8875bef}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{e502d69e-3182-4849-8a80-09df8b3f5ce5}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\criticalsection.h">
@@ -23,15 +26,27 @@ <ClInclude Include="src\TigerHash.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\FlashAvatars.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\cflash.cpp" />
- <ClCompile Include="src\stdafx.cpp" />
- <ClCompile Include="src\TigerHash.cpp" />
+ <ClCompile Include="src\cflash.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\TigerHash.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/FlashAvatars/res/Version.rc b/plugins/FlashAvatars/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/FlashAvatars/res/Version.rc @@ -0,0 +1,38 @@ +// 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"
+
+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/FlashAvatars/src/TigerHash.cpp b/plugins/FlashAvatars/src/TigerHash.cpp index 406676f0a5..094ba444ed 100644 --- a/plugins/FlashAvatars/src/TigerHash.cpp +++ b/plugins/FlashAvatars/src/TigerHash.cpp @@ -17,7 +17,6 @@ */
#include "stdafx.h"
-#include "TigerHash.h"
#ifdef _WIN32
#if defined(_M_X64)
diff --git a/plugins/FlashAvatars/src/TigerHash.h b/plugins/FlashAvatars/src/TigerHash.h index 8704ed552a..33eb26ad8f 100644 --- a/plugins/FlashAvatars/src/TigerHash.h +++ b/plugins/FlashAvatars/src/TigerHash.h @@ -19,8 +19,6 @@ #if !defined(TIGER_HASH_H)
#define TIGER_HASH_H
-#include <tchar.h>
-
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
diff --git a/plugins/FlashAvatars/src/Version.h b/plugins/FlashAvatars/src/Version.h new file mode 100644 index 0000000000..e8dbbfc6b3 --- /dev/null +++ b/plugins/FlashAvatars/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 0
+#define __RELEASE_NUM 1
+#define __BUILD_NUM 14
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Flash avatars"
+#define __FILENAME "FlashAvatars.dll"
+#define __DESCRIPTION "Loads and displays flash avatars."
+#define __AUTHOR "Big Muscle"
+#define __AUTHOREMAIL ""
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2000-2009 Miranda-IM project"
diff --git a/plugins/FlashAvatars/src/cflash.cpp b/plugins/FlashAvatars/src/cflash.cpp index e99984afbc..00c1226331 100644 --- a/plugins/FlashAvatars/src/cflash.cpp +++ b/plugins/FlashAvatars/src/cflash.cpp @@ -1,50 +1,19 @@ #include "stdafx.h"
-#define MIRANDA_VER 0x0A00
-
-#include "m_stdhdr.h"
-#include "win2k.h"
-
-#include <newpluginapi.h>
-#include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_database.h>
-#include <m_protosvc.h>
-#include <statusmodes.h>
-#include <m_clist.h>
-#include <m_langpack.h>
-
-#include <io.h>
-#include <fcntl.h>
-#include <Winsock2.h>
-
-#include "m_flash.h"
-#include "m_avatars.h"
-#include "m_utils.h"
-#include "m_netlib.h"
-
-#include "m_clist.h"
-#include "m_clistint.h"
-
-#include "m_folders.h"
-
-#include "CriticalSection.h"
-#include "TigerHash.h"
-
#import "Flash.tlb" no_namespace exclude("IServiceProvider")
PLUGININFOEX pluginInfo = {
- sizeof(PLUGININFOEX),
- "Flash Avatars",
- PLUGIN_MAKE_VERSION(0, 0, 1, 14),
- "Loads and displays flash avatars.",
- "Big Muscle",
- "",
- "Copyright 2000-2009 Miranda-IM project",
- "http://miranda-ng.org/",
+ sizeof(PLUGININFOEX),
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
- // {72765A6F-B017-42f1-B30F-5E0941273A3F}
- { 0x72765a6f, 0xb017, 0x42f1, { 0xb3, 0xf, 0x5e, 0x9, 0x41, 0x27, 0x3a, 0x3f } }
+ // {72765A6F-B017-42F1-B30F-5E0941273A3F}
+ {0x72765a6f, 0xb017, 0x42f1, {0xb3, 0xf, 0x5e, 0x9, 0x41, 0x27, 0x3a, 0x3f}}
};
diff --git a/plugins/FlashAvatars/src/stdafx.h b/plugins/FlashAvatars/src/stdafx.h index a5df8294e9..731c64963b 100644 --- a/plugins/FlashAvatars/src/stdafx.h +++ b/plugins/FlashAvatars/src/stdafx.h @@ -27,8 +27,28 @@ #define _STLP_NO_ANACHRONISMS 1
#include <windows.h>
-#include <stdio.h>
+#include <io.h>
+#include <fcntl.h>
+#include <Winsock2.h>
+#include <m_stdhdr.h>
+#include <win2k.h>
+#include <newpluginapi.h>
+#include <m_system_cpp.h>
+#include <m_database.h>
+#include <m_protosvc.h>
+#include <m_langpack.h>
+#include <m_avatars.h>
+#include <m_netlib.h>
+#include <m_clistint.h>
+
+#include <m_folders.h>
+#include <m_flash.h>
+
+#include "CriticalSection.h"
+#include "TigerHash.h"
+#include "Version.h"
+#include "resource.h"
#ifdef _DEBUG
|