diff options
| -rw-r--r-- | protocols/Tlen/res/tlen.rc | 45 | ||||
| -rw-r--r-- | protocols/Tlen/res/version.rc | 38 | ||||
| -rw-r--r-- | protocols/Tlen/src/commons.h | 20 | ||||
| -rw-r--r-- | protocols/Tlen/src/tlen.cpp | 23 | ||||
| -rw-r--r-- | protocols/Tlen/src/version.h | 17 | ||||
| -rw-r--r-- | protocols/Tlen/tlen_10.vcxproj | 2 | ||||
| -rw-r--r-- | protocols/Tlen/tlen_10.vcxproj.filters | 6 | ||||
| -rw-r--r-- | protocols/Tlen/tlen_11.vcxproj | 2 | ||||
| -rw-r--r-- | protocols/Tlen/tlen_11.vcxproj.filters | 6 | ||||
| -rw-r--r-- | protocols/Xfire/src/version.h | 2 | 
10 files changed, 85 insertions, 76 deletions
| diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc index 3cbae89e06..c926f9ac58 100644 --- a/protocols/Tlen/res/tlen.rc +++ b/protocols/Tlen/res/tlen.rc @@ -1,5 +1,4 @@  #include "..\src\resource.h"
 -#include "..\src\commons.h"
  #include <windows.h>
  #ifndef IDC_STATIC
  #define IDC_STATIC (-1)
 @@ -365,50 +364,6 @@ BEGIN      CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,3,40,203,4
  END
 -
 -/////////////////////////////////////////////////////////////////////////////
 -//
 -// Version
 -//
 -
 -VS_VERSION_INFO VERSIONINFO
 - FILEVERSION TLEN_FILEVERSION_STRING
 - PRODUCTVERSION TLEN_FILEVERSION_STRING
 - FILEFLAGSMASK 0x3fL
 -#ifdef _DEBUG
 - FILEFLAGS 0x1L
 -#else
 - FILEFLAGS 0x0L
 -#endif
 - FILEOS 0x40004L
 - FILETYPE 0x2L
 - FILESUBTYPE 0x0L
 -BEGIN
 -    BLOCK "StringFileInfo"
 -    BEGIN
 -        BLOCK "041504e3"
 -        BEGIN
 -            VALUE "Comments", "\0"
 -            VALUE "CompanyName", "http://miranda-ng.org/\0"
 -            VALUE "FileDescription", "Tlen Protocol Plugin for Miranda NG\0"
 -            VALUE "FileVersion", TLEN_VERSION_STRING
 -            VALUE "InternalName", "tlen\0"
 -            VALUE "LegalCopyright", "Copyright (c) 2002-2011 Santithorn Bunchua, Piotr Piastucki\0"
 -            VALUE "LegalTrademarks", "\0"
 -            VALUE "OriginalFilename", "tlen.dll\0"
 -            VALUE "PrivateBuild", "\0"
 -            VALUE "ProductName", "Tlen Protocol Plugin\0"
 -            VALUE "ProductVersion", TLEN_VERSION_STRING
 -            VALUE "SpecialBuild", "\0"
 -        END
 -    END
 -    BLOCK "VarFileInfo"
 -    BEGIN
 -        VALUE "Translation", 0x415, 1251
 -    END
 -END
 -
 -
  /////////////////////////////////////////////////////////////////////////////
  //
  // Icon
 diff --git a/protocols/Tlen/res/version.rc b/protocols/Tlen/res/version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/protocols/Tlen/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/protocols/Tlen/src/commons.h b/protocols/Tlen/src/commons.h index 87df67a285..37f81198e3 100644 --- a/protocols/Tlen/src/commons.h +++ b/protocols/Tlen/src/commons.h @@ -1,24 +1,6 @@  #ifndef _TLENCOMMONS_INC
  #define _TLENCOMMONS_INC
 -
 -#define TLENMUCC_MAJOR_VERSION		2
 -#define TLENMUCC_MINOR_VERSION		1
 -#define TLENMUCC_RELEASE_NUM		0
 -#define TLENMUCC_BUILD_NUM			0
 -#define TLENMUCC_VERSION_STRING		"2.1.0.0"
 -
 -
 -
 -//consts for tlen.dll
 -#define TLEN_MAJOR_VERSION		TLENMUCC_MAJOR_VERSION
 -#define TLEN_MINOR_VERSION		TLENMUCC_MINOR_VERSION
 -#define TLEN_RELEASE_NUM		TLENMUCC_RELEASE_NUM
 -#define TLEN_BUILD_NUM			TLENMUCC_BUILD_NUM
 -
 -#define TLEN_FILEVERSION_STRING		TLEN_MAJOR_VERSION,TLEN_MINOR_VERSION,TLEN_RELEASE_NUM,TLEN_BUILD_NUM
 -#define TLEN_VERSION_STRING			TLENMUCC_VERSION_STRING
 -
 -
 +#include "version.h"
  #endif //ifndef _TLENCOMMONS_INC
 diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index 61ca7c8d3b..ed149cf861 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -40,17 +40,18 @@ int hLangpack;  HINSTANCE hInst;
  HANDLE hMainThread;
 -PLUGININFOEX pluginInfoEx = {
 +PLUGININFOEX pluginInfo = {
  	sizeof(PLUGININFOEX),
 -	"Tlen Protocol",
 -	PLUGIN_MAKE_VERSION(TLEN_MAJOR_VERSION,TLEN_MINOR_VERSION,TLEN_RELEASE_NUM,TLEN_BUILD_NUM),
 -	"Tlen protocol support for Miranda NG.",
 -	"Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki",
 -	"the_leech@users.berlios.de",
 -	"(c) 2002-2012 Santithorn Bunchua, Piotr Piastucki",
 -	"http://miranda-ng.org/",
 +	__PLUGIN_NAME,
 +	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
 +	__DESCRIPTION,
 +	__AUTHOR,
 +	__AUTHOREMAIL,
 +	__COPYRIGHT,
 +	__AUTHORWEB,
  	UNICODE_AWARE,
 -	{0x748f8934, 0x781a, 0x528d, { 0x52, 0x08, 0x00, 0x12, 0x65, 0x40, 0x4a, 0xb3 }}
 +	// {748F8934-781A-528D-5208-001265404AB3}
 +	{0x748f8934, 0x781a, 0x528d, {0x52, 0x08, 0x00, 0x12, 0x65, 0x40, 0x4a, 0xb3}}
  };
  // Main tlen server connection thread global variables
 @@ -67,7 +68,7 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpvReserved)  extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
  {
 -	return &pluginInfoEx;
 +	return &pluginInfo;
  }
  extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};
 @@ -391,7 +392,7 @@ static int tlenProtoUninit(TlenProtocol* ppro)  extern "C" int __declspec(dllexport) Load(void)
  {
 -	mir_getLP( &pluginInfoEx );
 +	mir_getLP( &pluginInfo );
  	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hMainThread, THREAD_SET_CONTEXT, FALSE, 0);
 diff --git a/protocols/Tlen/src/version.h b/protocols/Tlen/src/version.h new file mode 100644 index 0000000000..8d419d309d --- /dev/null +++ b/protocols/Tlen/src/version.h @@ -0,0 +1,17 @@ +#define __MAJOR_VERSION				2
 +#define __MINOR_VERSION				1
 +#define __RELEASE_NUM				0
 +#define __BUILD_NUM					0
 +
 +#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
 +
 +#define TLENMUCC_VERSION_STRING		"2.1.0.0"
 +#define TLEN_VERSION_STRING			TLENMUCC_VERSION_STRING
 +
 +#define __PLUGIN_NAME				"Tlen Protocol"
 +#define __FILENAME					"Tlen.dll"
 +#define __DESCRIPTION 				"Tlen protocol support for Miranda NG."
 +#define __AUTHOR					"Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki"
 +#define __AUTHOREMAIL				"the_leech@users.berlios.de"
 +#define __AUTHORWEB					"http://miranda-ng.org/p/Tlen/"
 +#define __COPYRIGHT					"(c) 2002-2012 Santithorn Bunchua, Piotr Piastucki"
 diff --git a/protocols/Tlen/tlen_10.vcxproj b/protocols/Tlen/tlen_10.vcxproj index 420d454142..2778de69fe 100644 --- a/protocols/Tlen/tlen_10.vcxproj +++ b/protocols/Tlen/tlen_10.vcxproj @@ -292,6 +292,7 @@    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="res\tlen.rc" />
 +    <ResourceCompile Include="res\version.rc" />
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="src\commons.h" />
 @@ -313,6 +314,7 @@      <ClInclude Include="src\tlen_picture.h" />
      <ClInclude Include="src\tlen_presence.h" />
      <ClInclude Include="src\tlen_voice.h" />
 +    <ClInclude Include="src\version.h" />
    </ItemGroup>
    <ItemGroup>
      <None Include="res\groupchats.ico" />
 diff --git a/protocols/Tlen/tlen_10.vcxproj.filters b/protocols/Tlen/tlen_10.vcxproj.filters index 44765e22b6..ae094969be 100644 --- a/protocols/Tlen/tlen_10.vcxproj.filters +++ b/protocols/Tlen/tlen_10.vcxproj.filters @@ -150,6 +150,9 @@      <ClInclude Include="src\commons.h">
        <Filter>Header Files</Filter>
      </ClInclude>
 +    <ClInclude Include="src\version.h">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
    </ItemGroup>
    <ItemGroup>
      <None Include="res\groupchats.ico">
 @@ -192,5 +195,8 @@      <ResourceCompile Include="res\tlen.rc">
        <Filter>Resource Files</Filter>
      </ResourceCompile>
 +    <ResourceCompile Include="res\version.rc">
 +      <Filter>Resource Files</Filter>
 +    </ResourceCompile>
    </ItemGroup>
  </Project>
\ No newline at end of file diff --git a/protocols/Tlen/tlen_11.vcxproj b/protocols/Tlen/tlen_11.vcxproj index 5bb46928bc..c1b0d463ce 100644 --- a/protocols/Tlen/tlen_11.vcxproj +++ b/protocols/Tlen/tlen_11.vcxproj @@ -293,6 +293,7 @@    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="res\tlen.rc" />
 +    <ResourceCompile Include="res\version.rc" />
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="src\commons.h" />
 @@ -314,6 +315,7 @@      <ClInclude Include="src\tlen_picture.h" />
      <ClInclude Include="src\tlen_presence.h" />
      <ClInclude Include="src\tlen_voice.h" />
 +    <ClInclude Include="src\version.h" />
    </ItemGroup>
    <ItemGroup>
      <None Include="res\auth_grant.ico" />
 diff --git a/protocols/Tlen/tlen_11.vcxproj.filters b/protocols/Tlen/tlen_11.vcxproj.filters index 1f0de881e5..b546b1e654 100644 --- a/protocols/Tlen/tlen_11.vcxproj.filters +++ b/protocols/Tlen/tlen_11.vcxproj.filters @@ -150,6 +150,9 @@      <ClInclude Include="src\commons.h">
        <Filter>Header Files</Filter>
      </ClInclude>
 +    <ClInclude Include="src\version.h">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
    </ItemGroup>
    <ItemGroup>
      <None Include="res\auth_grant.ico">
 @@ -204,5 +207,8 @@      <ResourceCompile Include="res\tlen.rc">
        <Filter>Resource Files</Filter>
      </ResourceCompile>
 +    <ResourceCompile Include="res\version.rc">
 +      <Filter>Resource Files</Filter>
 +    </ResourceCompile>
    </ItemGroup>
  </Project>
\ No newline at end of file diff --git a/protocols/Xfire/src/version.h b/protocols/Xfire/src/version.h index e46dd45ce1..75eaa91b76 100644 --- a/protocols/Xfire/src/version.h +++ b/protocols/Xfire/src/version.h @@ -5,7 +5,7 @@  #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
 -#define __PLUGIN_NAME				"Xfire protocol"
 +#define __PLUGIN_NAME				"Xfire Protocol"
  #define __FILENAME					"Xfire.dll"
  #define __DESCRIPTION 				"Xfire protocol support for Miranda NG."
  #define __AUTHOR					"dufte"
 | 
