diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-27 22:59:43 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-27 23:00:45 +0300 |
| commit | e06a3bd4b50fd001f4d0d49c10a0c4b988c563a0 (patch) | |
| tree | ca8d3fba504b185adf1928b998935f8345d66cfd /src/mir_app | |
| parent | 6281960ec0d178935ca2881aff052a9eae5da337 (diff) | |
comparison of MIRANDA_VERSION_COREVERSION solves the problem of plugins who differ only in a build number
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/res/version.rc | 4 | ||||
| -rw-r--r-- | src/mir_app/src/dll_sniffer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
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;
}
|