From e06a3bd4b50fd001f4d0d49c10a0c4b988c563a0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 27 May 2018 22:59:43 +0300 Subject: comparison of MIRANDA_VERSION_COREVERSION solves the problem of plugins who differ only in a build number --- src/core/stdautoaway/res/version.rc | 2 +- src/core/stdaway/res/version.rc | 2 +- src/core/stdclist/res/version.rc | 2 +- src/core/stdcrypt/res/version.rc | 2 +- src/core/stdemail/res/version.rc | 2 +- src/core/stdfile/res/version.rc | 2 +- src/core/stdidle/res/version.rc | 2 +- src/core/stdmsg/res/version.rc | 2 +- src/core/stdssl/res/version.rc | 2 +- src/core/stduihist/res/version.rc | 2 +- src/core/stduserinfo/res/version.rc | 2 +- src/core/stduseronline/res/version.rc | 2 +- src/mir_app/res/version.rc | 4 ++-- src/mir_app/src/dll_sniffer.cpp | 8 ++++---- src/miranda32/res/version.rc | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/core/stdautoaway/res/version.rc b/src/core/stdautoaway/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdautoaway/res/version.rc +++ b/src/core/stdautoaway/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdaway/res/version.rc b/src/core/stdaway/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdaway/res/version.rc +++ b/src/core/stdaway/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdclist/res/version.rc b/src/core/stdclist/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdclist/res/version.rc +++ b/src/core/stdclist/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdcrypt/res/version.rc b/src/core/stdcrypt/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdcrypt/res/version.rc +++ b/src/core/stdcrypt/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdemail/res/version.rc b/src/core/stdemail/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdemail/res/version.rc +++ b/src/core/stdemail/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdfile/res/version.rc b/src/core/stdfile/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdfile/res/version.rc +++ b/src/core/stdfile/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdidle/res/version.rc b/src/core/stdidle/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdidle/res/version.rc +++ b/src/core/stdidle/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdmsg/res/version.rc b/src/core/stdmsg/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdmsg/res/version.rc +++ b/src/core/stdmsg/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stdssl/res/version.rc b/src/core/stdssl/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stdssl/res/version.rc +++ b/src/core/stdssl/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stduihist/res/version.rc b/src/core/stduihist/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stduihist/res/version.rc +++ b/src/core/stduihist/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stduserinfo/res/version.rc b/src/core/stduserinfo/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stduserinfo/res/version.rc +++ b/src/core/stduserinfo/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/core/stduseronline/res/version.rc b/src/core/stduseronline/res/version.rc index 6b47621286..832ac546a5 100644 --- a/src/core/stduseronline/res/version.rc +++ b/src/core/stduseronline/res/version.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/mir_app/res/version.rc b/src/mir_app/res/version.rc index f697a9c6a7..eacecf0548 100644 --- a/src/mir_app/res/version.rc +++ b/src/mir_app/res/version.rc @@ -18,8 +18,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 VS_VERSION_INFO VERSIONINFO - FILEVERSION MIRANDA_VERSION_FILEVERSION - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + FILEVERSION MIRANDA_VERSION_COREVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/mir_app/src/dll_sniffer.cpp b/src/mir_app/src/dll_sniffer.cpp index 8cffcbf98a..c2a61d2e3b 100644 --- a/src/mir_app/src/dll_sniffer.cpp +++ b/src/mir_app/src/dll_sniffer.cpp @@ -188,9 +188,9 @@ MUUID* GetPluginInterfaces(const wchar_t* ptszFileName, bool& bIsPlugin) VS_FIXEDFILEINFO *vsffi; VerQueryValue(&pSecStart[dwVersion], L"\\", (PVOID*)&vsffi, &blockSize); - // UINT v[4] = { MIRANDA_VERSION_FILEVERSION }; - // if (MAKELONG(v[1], v[0]) == vsffi->dwProductVersionMS && MAKELONG(v[3], v[2]) == vsffi->dwProductVersionLS) - // nChecks++; + UINT v[4] = { MIRANDA_VERSION_COREVERSION }; + if (MAKELONG(v[1], v[0]) == vsffi->dwProductVersionMS && MAKELONG(v[3], v[2]) == vsffi->dwProductVersionLS) + nChecks++; } } } @@ -204,6 +204,6 @@ MUUID* GetPluginInterfaces(const wchar_t* ptszFileName, bool& bIsPlugin) CloseHandle(hFile); }; - bIsPlugin = nChecks != 0; + bIsPlugin = nChecks == 2; return pResult; } diff --git a/src/miranda32/res/version.rc b/src/miranda32/res/version.rc index c5c908dd46..32a9d2b314 100644 --- a/src/miranda32/res/version.rc +++ b/src/miranda32/res/version.rc @@ -17,8 +17,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 VS_VERSION_INFO VERSIONINFO - FILEVERSION MIRANDA_VERSION_FILEVERSION - PRODUCTVERSION MIRANDA_VERSION_FILEVERSION + FILEVERSION MIRANDA_VERSION_COREVERSION + PRODUCTVERSION MIRANDA_VERSION_COREVERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L -- cgit v1.2.3