diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-12 15:41:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-12 15:41:26 +0000 |
| commit | 3aeddb1952f894ce41b055bc3d49c3fcc994c14e (patch) | |
| tree | 32a5255a8ae05b8435b177bbd8004aee5504170e /src | |
| parent | a582e723883bd6ede6e0c910e82cfc4ad23bc161 (diff) | |
- changed m_crypto.h;
- crypto-plugins are forced to be loaded in the very beginning, alongside with the database plugins
git-svn-id: http://svn.miranda-ng.org/main/trunk@6874 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdcrypt/stdcrypt_10.vcxproj | 1 | ||||
| -rw-r--r-- | src/core/stdcrypt/stdcrypt_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/core/stdcrypt/stdcrypt_11.vcxproj | 1 | ||||
| -rw-r--r-- | src/core/stdcrypt/stdcrypt_11.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/core/stdcrypt/stdcrypt_12.vcxproj | 1 | ||||
| -rw-r--r-- | src/core/stdcrypt/stdcrypt_12.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 17 |
7 files changed, 22 insertions, 7 deletions
diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj b/src/core/stdcrypt/stdcrypt_10.vcxproj index 9ebb911c39..a8fb8b5b1a 100644 --- a/src/core/stdcrypt/stdcrypt_10.vcxproj +++ b/src/core/stdcrypt/stdcrypt_10.vcxproj @@ -209,6 +209,7 @@ <ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\include\m_crypto.h" />
<ClInclude Include="..\stdplug.h" />
<ClInclude Include="commonheaders.h" />
</ItemGroup>
diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters index ec4b0c8910..f4466c28bd 100644 --- a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters +++ b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters @@ -32,6 +32,9 @@ <ClInclude Include="commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\m_crypto.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="version.rc">
diff --git a/src/core/stdcrypt/stdcrypt_11.vcxproj b/src/core/stdcrypt/stdcrypt_11.vcxproj index a9888bb36c..890a10e365 100644 --- a/src/core/stdcrypt/stdcrypt_11.vcxproj +++ b/src/core/stdcrypt/stdcrypt_11.vcxproj @@ -212,6 +212,7 @@ <ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\include\m_crypto.h" />
<ClInclude Include="..\stdplug.h" />
<ClInclude Include="commonheaders.h" />
</ItemGroup>
diff --git a/src/core/stdcrypt/stdcrypt_11.vcxproj.filters b/src/core/stdcrypt/stdcrypt_11.vcxproj.filters index ec4b0c8910..f4466c28bd 100644 --- a/src/core/stdcrypt/stdcrypt_11.vcxproj.filters +++ b/src/core/stdcrypt/stdcrypt_11.vcxproj.filters @@ -32,6 +32,9 @@ <ClInclude Include="commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\m_crypto.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="version.rc">
diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj b/src/core/stdcrypt/stdcrypt_12.vcxproj index e8912f09d9..2d7f5c5881 100644 --- a/src/core/stdcrypt/stdcrypt_12.vcxproj +++ b/src/core/stdcrypt/stdcrypt_12.vcxproj @@ -212,6 +212,7 @@ <ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\include\m_crypto.h" />
<ClInclude Include="..\stdplug.h" />
<ClInclude Include="commonheaders.h" />
</ItemGroup>
diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters index ec4b0c8910..f4466c28bd 100644 --- a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters +++ b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters @@ -32,6 +32,9 @@ <ClInclude Include="commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\m_crypto.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="version.rc">
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index f25393feab..b529a1af2c 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -122,8 +122,7 @@ static MuuidReplacement pluginDefault[] = { MIID_SRAWAY, _T("stdaway"), NULL }, // 10
{ MIID_CLIST, _T("stdclist"), NULL }, // 11
{ MIID_CHAT, _T("stdchat"), NULL }, // 12
- { MIID_SRMM, _T("stdmsg"), NULL }, // 13
- { MIID_CRYPTO, _T("stdcrypt"), NULL }, // 14
+ { MIID_SRMM, _T("stdmsg"), NULL } // 13
};
int getDefaultPluginIdx(const MUUID& muuid)
@@ -205,6 +204,7 @@ MUUID miid_clist = MIID_CLIST; MUUID miid_database = MIID_DATABASE;
MUUID miid_protocol = MIID_PROTOCOL;
MUUID miid_servicemode = MIID_SERVICEMODE;
+MUUID miid_crypto = MIID_CRYPTO;
static bool validInterfaceList(MUUID *piface)
{
@@ -407,12 +407,13 @@ pluginEntry* OpenPlugin(TCHAR *tszFileName, TCHAR *dir, TCHAR *path) return p;
}
- // plugin declared that it's a database. load it asap!
- if ( hasMuuid(pIds, miid_database)) {
+ // plugin declared that it's a database or a cryptor. load it asap!
+ bool bIsDb = hasMuuid(pIds, miid_database);
+ if (bIsDb || hasMuuid(pIds, miid_crypto)) {
BASIC_PLUGIN_INFO bpi;
if ( checkAPI(tszFullPath, &bpi, mirandaVersion, CHECKAPI_NONE)) {
- // db plugin is valid
- p->pclass |= (PCLASS_DB | PCLASS_BASICAPI);
+ // plugin is valid
+ p->pclass |= ((bIsDb ? PCLASS_DB : PCLASS_OK) | PCLASS_BASICAPI);
// copy the dblink stuff
p->bpi = bpi;
@@ -817,7 +818,9 @@ int LoadNewPluginsModuleInfos(void) PathToAbsoluteT(_T("mirandaboot.ini"), mirandabootini);
// look for all *.dll's
enumPlugins(scanPluginsDir, 0, 0);
- return 0;
+
+ MuuidReplacement stdCrypt = { MIID_CRYPTO, _T("stdcrypt"), NULL };
+ return !LoadCorePlugin(stdCrypt);
}
/////////////////////////////////////////////////////////////////////////////////////////
|