diff options
22 files changed, 161 insertions, 153 deletions
diff --git a/plugins/Alarms/Version.h b/plugins/Alarms/Version.h new file mode 100644 index 0000000000..45934bc715 --- /dev/null +++ b/plugins/Alarms/Version.h @@ -0,0 +1,20 @@ +#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 4
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 5
+
+#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 "Alarms"
+#define __INTERNAL_NAME "Alarms"
+#define __FILENAME "Alarms.dll"
+#define __DESCRIPTION "Set once-off, daily, weekly and weekday alarms."
+#define __AUTHOR "Scott Ellis"
+#define __AUTHOREMAIL "mail@scottellis.com.au"
+#define __AUTHORWEB "http://www.scottellis.com.au"
+#define __COPYRIGHT "© 2005 Scott Ellis"
diff --git a/plugins/Alarms/Version.rc b/plugins/Alarms/Version.rc new file mode 100644 index 0000000000..e637f0cb33 --- /dev/null +++ b/plugins/Alarms/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/Alarms/alarms.cpp b/plugins/Alarms/alarms.cpp index 626b917178..79cea6c27f 100644 --- a/plugins/Alarms/alarms.cpp +++ b/plugins/Alarms/alarms.cpp @@ -33,13 +33,13 @@ WNDPROC old_clist_wndproc; PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- "Alarms",
- PLUGIN_MAKE_VERSION(0,4,0,5),
- "Set once-off, daily, weekly and weekday alarms.",
- "Scott Ellis",
- "mail@scottellis.com.au",
- "© 2005 Scott Ellis",
- "http://www.scottellis.com.au",
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE, //not transient
0, //doesn't replace anything built-in
{ 0x4dd7762b, 0xd612, 0x4f84, { 0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d } } // {4DD7762B-D612-4f84-AA86-068F17859B6D}
@@ -62,8 +62,6 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) return interfaces;
}
-
-
static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message) {
diff --git a/plugins/Alarms/alarms_10.vcxproj b/plugins/Alarms/alarms_10.vcxproj index 0e4120925a..64a896c41e 100644 --- a/plugins/Alarms/alarms_10.vcxproj +++ b/plugins/Alarms/alarms_10.vcxproj @@ -204,6 +204,7 @@ <ClInclude Include="resource.h" />
<ClInclude Include="time_utils.h" />
<ClInclude Include="trigger.h" />
+ <ClInclude Include="Version.h" />
</ItemGroup>
<ItemGroup>
<None Include="clock.ico" />
@@ -214,6 +215,7 @@ </ItemGroup>
<ItemGroup>
<ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Alarms/alarms_10.vcxproj.filters b/plugins/Alarms/alarms_10.vcxproj.filters index 67fab38b2d..113441daf8 100644 --- a/plugins/Alarms/alarms_10.vcxproj.filters +++ b/plugins/Alarms/alarms_10.vcxproj.filters @@ -71,6 +71,9 @@ <ClInclude Include="trigger.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="clock.ico">
@@ -93,5 +96,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/Alarms/common.h b/plugins/Alarms/common.h index 0186d87228..d675ab1bf1 100644 --- a/plugins/Alarms/common.h +++ b/plugins/Alarms/common.h @@ -15,6 +15,7 @@ #include <commctrl.h>
#include "resource.h"
+#include "version.h"
#include <newpluginapi.h>
#include <m_system.h>
diff --git a/plugins/AssocMgr/assoclist.c b/plugins/AssocMgr/assoclist.cpp index 26a72a43da..524bf29152 100644 --- a/plugins/AssocMgr/assoclist.c +++ b/plugins/AssocMgr/assoclist.cpp @@ -607,7 +607,7 @@ static BOOL InvokeHandler_Worker(const char *pszClassName, const TCHAR *pszParam return TRUE;
}
-INT_PTR InvokeFileHandler(const TCHAR *pszFileName)
+INT_PTR InvokeFileHandler(TCHAR *pszFileName)
{
char *pszClassName, *pszFileExt;
TCHAR *p;
@@ -633,7 +633,7 @@ INT_PTR InvokeFileHandler(const TCHAR *pszFileName) return res;
}
-INT_PTR InvokeUrlHandler(const TCHAR *pszUrl)
+INT_PTR InvokeUrlHandler(TCHAR *pszUrl)
{
char *pszClassName, *pszProtoPrefix, *p;
INT_PTR res = CALLSERVICE_NOTFOUND;
diff --git a/plugins/AssocMgr/assoclist.h b/plugins/AssocMgr/assoclist.h index 5e8806b828..44d90013e3 100644 --- a/plugins/AssocMgr/assoclist.h +++ b/plugins/AssocMgr/assoclist.h @@ -26,8 +26,8 @@ void CleanupMimeTypeAddedSettings(void); /* Assoc List Utils */
BOOL IsRegisteredAssocItem(const char *pszClassName);
/* Open Handler */
-INT_PTR InvokeFileHandler(const TCHAR *pszFileName);
-INT_PTR InvokeUrlHandler(const TCHAR *pszUrl);
+INT_PTR InvokeFileHandler(TCHAR *pszFileName);
+INT_PTR InvokeUrlHandler(TCHAR *pszUrl);
/* Misc */
void InitAssocList(void);
void UninitAssocList(void);
diff --git a/plugins/AssocMgr/assocmgr.vcxproj b/plugins/AssocMgr/assocmgr.vcxproj index 3c76717f49..44462d6eff 100644 --- a/plugins/AssocMgr/assocmgr.vcxproj +++ b/plugins/AssocMgr/assocmgr.vcxproj @@ -182,12 +182,12 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="assoclist.c" />
- <ClCompile Include="dde.c" />
- <ClCompile Include="main.c" />
- <ClCompile Include="reg.c" />
- <ClCompile Include="test.c" />
- <ClCompile Include="utils.c" />
+ <ClCompile Include="assoclist.cpp" />
+ <ClCompile Include="dde.cpp" />
+ <ClCompile Include="main.cpp" />
+ <ClCompile Include="reg.cpp" />
+ <ClCompile Include="test.cpp" />
+ <ClCompile Include="utils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="assoclist.h" />
@@ -211,6 +211,7 @@ </ItemGroup>
<ItemGroup>
<ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="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 cfdb339f8c..2053a987d1 100644 --- a/plugins/AssocMgr/assocmgr.vcxproj.filters +++ b/plugins/AssocMgr/assocmgr.vcxproj.filters @@ -17,28 +17,24 @@ <UniqueIdentifier>{6f8e30e0-bc03-46e7-b039-e0fbd019afb2}</UniqueIdentifier>
<Extensions>txt</Extensions>
</Filter>
- <Filter Include="SDK">
- <UniqueIdentifier>{cc674aae-3e65-4f1c-959f-c95acfe7111a}</UniqueIdentifier>
- <Extensions>*.h</Extensions>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="assoclist.c">
+ <ClCompile Include="assoclist.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="dde.c">
+ <ClCompile Include="dde.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.c">
+ <ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="reg.c">
+ <ClCompile Include="reg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="test.c">
+ <ClCompile Include="test.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.c">
+ <ClCompile Include="utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -72,6 +68,9 @@ <ResourceCompile Include="resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="res\miranda.ico">
diff --git a/plugins/AssocMgr/common.h b/plugins/AssocMgr/common.h index 6f5592f524..b4099847bf 100644 --- a/plugins/AssocMgr/common.h +++ b/plugins/AssocMgr/common.h @@ -19,22 +19,19 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#define MIRANDA_VER 0x0A00
#define _CRT_SECURE_NO_WARNINGS
#define _WIN32_WINNT 0x0600
-#define __RPCASYNC_H__ /* VC6 has a mistake in there (warning) */
+
#include <windows.h>
-#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union */
-#pragma warning(disable:4115) /* V6 has a mistake in there (warning) */
#include <shlobj.h> /* for SHChangeNotify() */
-#pragma warning(default:4115)
#include <commctrl.h>
-#pragma warning(default:4201)
#include <tchar.h>
#include <stdio.h> /* for mir_snprintf() */
#include <Vsstyle.h>
#include <Vssym32.h>
+#include <malloc.h>
-#define MIRANDA_VER 0x0A00
#include <newpluginapi.h>
#include <m_system.h>
#include <m_database.h>
diff --git a/plugins/AssocMgr/dde.c b/plugins/AssocMgr/dde.cpp index 0804be855c..763002aa67 100644 --- a/plugins/AssocMgr/dde.c +++ b/plugins/AssocMgr/dde.cpp @@ -30,8 +30,9 @@ static HANDLE hHookModulesLoaded,hHookPreShutdown; /************************* Open Handler ***************************/
// pszFilePath needs to be allocated using mir_alloc()
-static void __stdcall FileActionAsync(TCHAR *pszFilePath)
+static void __stdcall FileActionAsync(void *param)
{
+ TCHAR *pszFilePath = (TCHAR*)param;
/* invoke main handler */
switch(InvokeFileHandler(pszFilePath)) { /* pszFilePath is always a long path name */
case 0: /* success */ break;
@@ -42,11 +43,13 @@ static void __stdcall FileActionAsync(TCHAR *pszFilePath) ShowInfoMessage(NIIF_ERROR,Translate("Miranda IM could not open file"),Translate("Miranda IM was not able to open \""TCHAR_STR_PARAM"\".\n\nThe file could not be processed."),pszFilePath);
}
mir_free(pszFilePath); /* async param */
+ mir_free(param);
}
// pszUrl needs to be allocated using mir_alloc()
-static void __stdcall UrlActionAsync(TCHAR *pszUrl)
+static void __stdcall UrlActionAsync(void *param)
{
+ TCHAR *pszUrl = (TCHAR*)param;
/* invoke main handler */
switch(InvokeUrlHandler(pszUrl)) {
case 0: /* success */ break;
@@ -57,6 +60,7 @@ static void __stdcall UrlActionAsync(TCHAR *pszUrl) ShowInfoMessage(NIIF_ERROR,Translate("Miranda IM could not open URL"),Translate("Miranda IM was not able to open \""TCHAR_STR_PARAM"\".\n\nThe given URL is invalid and can not be parsed."),pszUrl);
}
mir_free(pszUrl); /* async param */
+ mir_free(param);
}
/************************* Conversation ***************************/
@@ -111,7 +115,7 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM /* ANSI execute command can't happen for shell */
if(IsWindowUnicode((HWND)wParam)) {
#endif
- pszCommand=GlobalLock(hCommand);
+ pszCommand = (TCHAR*)GlobalLock(hCommand);
if(pszCommand!=NULL) {
TCHAR *pszAction,*pszArg;
pszAction=GetExecuteParam(&pszCommand);
@@ -120,9 +124,9 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM /* we are inside miranda here, we make it async so the shell does
* not timeout regardless what the plugins try to do. */
if (!lstrcmpi(pszAction,_T("file")))
- ack.fAck=(short)(CallFunctionAsync(FileActionAsync,pszArg)!=0);
+ ack.fAck=(short)(CallFunctionAsync(FileActionAsync, pszArg)!=0);
else if (!lstrcmpi(pszAction,_T("url")))
- ack.fAck=(short)(CallFunctionAsync(UrlActionAsync,pszArg)!=0);
+ ack.fAck=(short)(CallFunctionAsync(UrlActionAsync, pszArg)!=0);
if (!ack.fAck) mir_free(pszArg); /* otherwise freed by asyncproc */
}
GlobalUnlock(hCommand);
diff --git a/plugins/AssocMgr/main.c b/plugins/AssocMgr/main.cpp index a689ad654d..2a1ad430a2 100644 --- a/plugins/AssocMgr/main.c +++ b/plugins/AssocMgr/main.cpp @@ -31,13 +31,13 @@ int hLangpack; PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- "File Association Manager",
- PLUGIN_VERSION,
- "Handles file type associations and URLs like aim, ymsgr, xmpp, wpmsg, gg, tlen.", /* autotranslated */
- "H. Herkenrath",
- "hrathh@users.sourceforge.net",
- "© 2005-2007 H. Herkenrath",
- PLUGIN_WEBSITE,
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
0,
// {52685CD7-0EC7-44c1-A1A6-381612418202}
@@ -45,15 +45,9 @@ PLUGININFOEX pluginInfo={ };
static const MUUID interfaces[]={MIID_ASSOCMGR,MIID_AUTORUN,MIID_LAST};
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,void *pReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- UNREFERENCED_PARAMETER(pReserved);
- if(fdwReason==DLL_PROCESS_ATTACH) {
- /* Do not call this from a DLL that is linked to the static C run-time library (CRT).
- * The static CRT requires DLL_THREAD_ATTACH and DLL_THREAD_DETATCH notifications
- * to function properly. */
- DisableThreadLibraryCalls(hInst=hinstDLL);
- }
+ hInst = hinstDLL;
return TRUE;
}
@@ -96,36 +90,21 @@ static int AssocMgrModulesLoaded(WPARAM wParam,LPARAM lParam) return 0;
}
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-__declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
-__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
{
return interfaces;
}
-__declspec(dllexport) int Load(PLUGINLINK *link)
+extern "C" __declspec(dllexport) int Load(PLUGINLINK *link)
{
pluginLink=link;
mir_getLP(&pluginInfo);
- /* existance of MS_SYSTEM_GETVERSION and MS_LANGPACK_TRANSLATESTRING
- * is checked in MirandaPluginInfo().
- * Not placed in MirandaPluginInfo() to avoid MessageBoxes on plugin options.
- * Using ANSI as LANG_UNICODE might not be supported. */
- if(CallService(MS_SYSTEM_GETVERSION,0,0)<NEEDED_MIRANDA_VERSION) {
- char szText[256];
- mir_snprintf(szText,sizeof(szText),Translate("The File Association Manager Plugin can not be loaded. It requires Miranda IM %hs or later."),NEEDED_MIRANDA_VERSION_STR);
- MessageBoxA(NULL,szText,Translate("File Association Manager Plugin"),MB_OK|MB_ICONINFORMATION|MB_SETFOREGROUND|MB_TOPMOST|MB_TASKMODAL);
- return 1;
- }
-
if (!ServiceExists(MS_DB_CONTACT_GETSETTING_STR)) return 1; /* dbx3x v0.5.1.0 */
if(mir_getMMI(&mmi)) return 1;
if(mir_getUTFI(&utfi)) return 1;
@@ -140,15 +119,11 @@ __declspec(dllexport) int Load(PLUGINLINK *link) return 0;
}
-__declspec(dllexport) int Unload(void)
+extern "C" __declspec(dllexport) int Unload(void)
{
UninitTest();
UninitDde();
UninitAssocList();
UnhookEvent(hHookModulesLoaded);
return 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
+}
\ No newline at end of file diff --git a/plugins/AssocMgr/reg.c b/plugins/AssocMgr/reg.cpp index 09b58a1462..6d10421493 100644 --- a/plugins/AssocMgr/reg.c +++ b/plugins/AssocMgr/reg.cpp @@ -115,7 +115,7 @@ char *MakeUrlClassName(const char *pszUrl) return pszClass;
}
-static BOOL IsFileClassName(const char *pszClassName,const char **ppszFileExt)
+static BOOL IsFileClassName(char *pszClassName, char **ppszFileExt)
{
*ppszFileExt=strchr(pszClassName,'.');
return *ppszFileExt!=NULL;
@@ -165,7 +165,7 @@ static BOOL IsValidRunCommand(const TCHAR *pszRunCmd) {
TCHAR *buf,*pexe,*pargs;
TCHAR szFullExe[MAX_PATH],*pszFilePart;
- buf=lstrcpy(_alloca((lstrlen(pszRunCmd)+1)*sizeof(TCHAR)),pszRunCmd);
+ buf=lstrcpy((TCHAR*)_alloca((lstrlen(pszRunCmd)+1)*sizeof(TCHAR)),pszRunCmd);
/* split into executable path and arguments */
if(buf[0]==_T('\"')) {
pargs=_tcschr(&buf[1],_T('\"'));
diff --git a/plugins/AssocMgr/test.c b/plugins/AssocMgr/test.cpp index 73112af5a5..73112af5a5 100644 --- a/plugins/AssocMgr/test.c +++ b/plugins/AssocMgr/test.cpp diff --git a/plugins/AssocMgr/utils.c b/plugins/AssocMgr/utils.cpp index 89e0867a59..cfc79ba50e 100644 --- a/plugins/AssocMgr/utils.c +++ b/plugins/AssocMgr/utils.cpp @@ -112,7 +112,7 @@ static int EnumPrefixSettingsProc(const char *pszSetting,LPARAM lParam) if (!strncmp(pszSetting,param->pszPrefix,param->nPrefixLen)) {
char **buf;
/* resize storage array */
- buf=mir_realloc(param->settings,(param->nSettingsCount+1)*sizeof(char*));
+ buf = (char **)mir_realloc(param->settings,(param->nSettingsCount+1)*sizeof(char*));
if(buf!=NULL) {
param->settings=buf;
buf[param->nSettingsCount]=mir_strdup(pszSetting);
@@ -142,12 +142,14 @@ BOOL EnumDbPrefixSettings(const char *pszModule,const char *pszSettingPrefix,cha /************************* Error Output ***************************/
-static void MessageBoxIndirectFree(MSGBOXPARAMSA *mbp)
+static void MessageBoxIndirectFree(void *param)
{
+ MSGBOXPARAMSA *mbp = (MSGBOXPARAMSA*)param;
MessageBoxIndirectA(mbp);
mir_free((char*)mbp->lpszCaption); /* does NULL check */
mir_free((char*)mbp->lpszText); /* does NULL check */
mir_free(mbp);
+ mir_free(param);
}
void ShowInfoMessage(BYTE flags,const char *pszTitle,const char *pszTextFmt,...)
@@ -184,7 +186,7 @@ void ShowInfoMessage(BYTE flags,const char *pszTitle,const char *pszTextFmt,...) case NIIF_WARNING: mbp->dwStyle|=MB_ICONWARNING; break;
case NIIF_ERROR: mbp->dwStyle|=MB_ICONERROR;
}
- mir_forkthread(MessageBoxIndirectFree,mbp);
+ mir_forkthread(MessageBoxIndirectFree, mbp);
}
// LocalFree() the return value
diff --git a/plugins/AssocMgr/version.h b/plugins/AssocMgr/version.h index ce9485a55f..9d68defbef 100644 --- a/plugins/AssocMgr/version.h +++ b/plugins/AssocMgr/version.h @@ -19,22 +19,23 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define NEEDED_MIRANDA_VERSION PLUGIN_MAKE_VERSION(0,6,0,0)
-#define NEEDED_MIRANDA_VERSION_STR "0.6"
-#define PLUGIN_VERSION PLUGIN_MAKE_VERSION(0,1,1,0)
-#define FILE_VERSION 0,1,1,0
-
-#if defined(_DEBUG)
- #define FILE_VERSION_STR "0.1.1.1 alpha"
-#else
- #define FILE_VERSION_STR "0.1.1.0"
-#endif
-
-#define PLUGIN_EMAIL "hrathh users.sourceforge.net"
-#define PLUGIN_EMAIL_ATT_POS 7 /* position of the @-sign in the email adress above */
-
-#if defined(_UNICODE)
- #define PLUGIN_WEBSITE "http://addons.miranda-im.org/details.php?action=viewfile&id=3458"
-#else
- #define PLUGIN_WEBSITE "http://addons.miranda-im.org/details.php?action=viewfile&id=3457"
-#endif
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 1
+#define __RELEASE_NUM 1
+#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 "File Association Manager"
+#define __INTERNAL_NAME "AssocMgr"
+#define __FILENAME "AssocMgr.dll"
+#define __DESCRIPTION "Handles file type associations and URLs like aim, ymsgr, xmpp, wpmsg, gg, tlen."
+#define __AUTHOR "H. Herkenrath"
+#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
+#define __AUTHORWEB "http://addons.miranda-im.org/details.php?action=viewfile&id=3457"
+#define __COPYRIGHT "© 2005-2007 H. Herkenrath"
diff --git a/plugins/AssocMgr/version.rc b/plugins/AssocMgr/version.rc index 4234d8d7ec..b052561f31 100644 --- a/plugins/AssocMgr/version.rc +++ b/plugins/AssocMgr/version.rc @@ -1,5 +1,3 @@ -#ifndef _MAC
-
#include "version.h"
/////////////////////////////////////////////////////////////////////////////
@@ -8,34 +6,27 @@ //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILE_VERSION
- PRODUCTVERSION FILE_VERSION
- FILEFLAGSMASK 0x0L
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
+ FILEOS 0x4L
+ FILETYPE 0x0L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "Comments", "Licensed under the terms of the GNU General Public License"
- VALUE "FileDescription", "File Association Manager Plugin for Miranda IM"
- VALUE "FileVersion", FILE_VERSION_STR
-#ifdef _UNICODE
- VALUE "InternalName", "AssocMgr (Unicode)"
-#else
- VALUE "InternalName", "AssocMgr"
-#endif
- VALUE "LegalCopyright", "Copyright © 2005-2007 H. Herkenrath"
- VALUE "OriginalFilename", "assocmgr.dll"
- VALUE "ProductName", "File Association Manager"
- VALUE "ProductVersion", FILE_VERSION_STR
+ VALUE "FileDescription", __DESCRIPTION
+ VALUE "InternalName", __PLUGIN_NAME
+ VALUE "LegalCopyright", __COPYRIGHT
+ VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
END
END
BLOCK "VarFileInfo"
@@ -43,9 +34,3 @@ BEGIN VALUE "Translation", 0x0, 1200
END
END
-
-#endif // !_MAC
-
-
-
-
diff --git a/plugins/FreeImage/Miranda/version.h b/plugins/FreeImage/Miranda/version.h index 5504fc0c44..e3114530b0 100644 --- a/plugins/FreeImage/Miranda/version.h +++ b/plugins/FreeImage/Miranda/version.h @@ -3,7 +3,7 @@ #define __FILEVERSION_STRING MIRANDA_VERSION_FILEVERSION
#define __VERSION_STRING MIRANDA_VERSION_STRING
#define __VERSION_DWORD MIRANDA_VERSION_DWORD
-#define __PLUGIN_NAME "AdvaImg"
+#define __PLUGIN_NAME "Miranda Image services"
#define __INTERNAL_NAME "AdvaImg"
#define __FILENAME "AdvaImg.dll"
#define __DESCRIPTION "Generic image services for Miranda IM."
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp index f9d1bd04d9..2e4f5f288a 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp @@ -53,11 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) PLUGININFOEX pluginInfoEx={
sizeof(PLUGININFOEX),
- #if defined( _UNICODE )
- __PLUGIN_NAME __PLATFORM_NAME " (Unicode)",
- #else
- __PLUGIN_NAME,
- #endif
+ __PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESC,
__AUTHOR,
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/version.h b/plugins/StatusPlugins/AdvancedAutoAway/version.h index 9c0462460d..efca246872 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/version.h +++ b/plugins/StatusPlugins/AdvancedAutoAway/version.h @@ -10,18 +10,10 @@ #define __RELEASE_NUM 0
#define __BUILD_NUM 42
-// minimal MirandaIM version number, with which this plugin supposed to work
-#define __PROD_MAJOR_VERSION 0
-#define __PROD_MINOR_VERSION 8
-#define __PROD_RELEASE_NUM 0
-#define __PROD_BUILD_NUM 0
-// if your plugin works only with Miranda core beginning from specific revision, you can include this information in Product Version resource
-//#define __PROD_REV_NUM 1234
-
// stuff that will be used in PluginInfo section and in Version resource
#define __PLUGIN_NAME "Advanced Auto Away"
#define __FILENAME "AdvancedAutoAway.dll"
-#define __DESC "AdvancedAutoAway, an Auto Away module with some more options than the original."
+#define __DESC "An Auto Away module with some more options than the original."
#define __AUTHOR "P Boon"
#define __AUTHOREMAIL "unregistered@users.sourceforge.net"
#define __AUTHORWEB "http://www.miranda-im.org/"
@@ -46,11 +38,3 @@ #define __VERSION_STRING __STRINGIFY(__FILEVERSION_STRING_DOTS)
#endif
#endif
-
-#define __PRODVERSION_STRING __PROD_MAJOR_VERSION,__PROD_MINOR_VERSION,__PROD_RELEASE_NUM,__PROD_BUILD_NUM
-#define __PRODVERSION_STRING_DOTS __PROD_MAJOR_VERSION.__PROD_MINOR_VERSION.__PROD_RELEASE_NUM.__PROD_BUILD_NUM
-#ifdef __PROD_REV_NUM
-#define __PROD_VERSION_STRING __STRINGIFY(__PRODVERSION_STRING_DOTS rev. __PROD_REV_NUM)
-#else
-#define __PROD_VERSION_STRING __STRINGIFY(__PRODVERSION_STRING_DOTS+)
-#endif
diff --git a/plugins/StatusPlugins/version.rc b/plugins/StatusPlugins/version.rc index dac86f85a2..8f6f25b2da 100644 --- a/plugins/StatusPlugins/version.rc +++ b/plugins/StatusPlugins/version.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __PRODVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -30,7 +30,6 @@ BEGIN VALUE "OriginalFilename", __FILENAME
VALUE "FileVersion", __VERSION_STRING
VALUE "ProductName", "Miranda IM"
- VALUE "ProductVersion", __PROD_VERSION_STRING
END
END
BLOCK "VarFileInfo"
|