From 3f26a39c43faef04ea316ecc98d8d195982bb303 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jun 2012 20:41:50 +0000 Subject: final wipeout of all interfaces git-svn-id: http://svn.miranda-ng.org/main/trunk@659 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/database/database.cpp | 2 - src/modules/netlib/netlibhttpproxy.cpp | 9 ---- src/modules/plugins/newplugins.cpp | 41 +++-------------- src/modules/plugins/plugins.h | 4 +- src/modules/utils/md5.cpp | 80 ---------------------------------- src/modules/utils/utils.cpp | 4 -- 6 files changed, 8 insertions(+), 132 deletions(-) delete mode 100644 src/modules/utils/md5.cpp (limited to 'src/modules') diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index 94adf17742..ec97fcaa9f 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "profilemanager.h" #include "../srfile/file.h" -// from the plugin loader, hate extern but the db frontend is pretty much tied -extern PLUGINLINK pluginCoreLink; // contains the location of mirandaboot.ini extern TCHAR mirandabootini[MAX_PATH]; bool dbCreated; diff --git a/src/modules/netlib/netlibhttpproxy.cpp b/src/modules/netlib/netlibhttpproxy.cpp index 7e0472c155..2e0824d3bd 100644 --- a/src/modules/netlib/netlibhttpproxy.cpp +++ b/src/modules/netlib/netlibhttpproxy.cpp @@ -351,15 +351,6 @@ int NetlibHttpGatewayRecv(struct NetlibConnection *nlc, char *buf, int len, int { nlhrReply->pData = (char*)nlc->nlu->user.pfnHttpGatewayUnwrapRecv(nlhrReply, (PBYTE)nlhrReply->pData, nlhrReply->dataLength, &nlhrReply->dataLength, mir_realloc); -/* - if (newBuffer == NULL) - { - NetlibHttpFreeRequestStruct(0, (LPARAM)nlhrReply); - return SOCKET_ERROR; - } - else - nlhrReply->pData = (char*)newBuffer; -*/ } if (nlhrReply->resultCode >= 300) diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index dcef628238..040a870cca 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -47,7 +47,6 @@ const int pluginBannedListCount = SIZEOF(pluginBannedList); static BOOL bModuleInitialized = FALSE; -PLUGINLINK pluginCoreLink; TCHAR mirandabootini[MAX_PATH]; static DWORD mirandaVersion; static int serviceModeIdx = -1; @@ -182,8 +181,7 @@ int checkAPI(TCHAR* plugin, BASIC_PLUGIN_INFO* bpi, DWORD mirandaVersion, int ch // fontservice plugin is built into the core now TCHAR* p = _tcsrchr(plugin, '\\'); if (p != NULL && ++p) { - int i; - for (i = 0; i < SIZEOF(modulesToSkip); i++) + for (int i = 0; i < SIZEOF(modulesToSkip); i++) if (lstrcmpi(p, modulesToSkip[i]) == 0) return 0; } @@ -494,7 +492,7 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic) } RegisterModule(p->bpi.hInst); - if (bpi.Load(&pluginCoreLink) != 0) + if (bpi.Load() != 0) return false; p->pclass |= PCLASS_LOADED; @@ -520,7 +518,7 @@ static pluginEntry* getCListModule(TCHAR * exe, TCHAR * slice, int useWhiteList) p->bpi = bpi; p->pclass |= PCLASS_LAST | PCLASS_OK | PCLASS_BASICAPI; RegisterModule(p->bpi.hInst); - if (bpi.clistlink(&pluginCoreLink) == 0) { + if (bpi.clistlink() == 0) { p->bpi = bpi; p->pclass |= PCLASS_LOADED; return p; @@ -588,7 +586,7 @@ int LoadServiceModePlugin(void) while (p != NULL) { if (serviceModeIdx == i++) { - if (p->bpi.Load(&pluginCoreLink) == 0) { + if (p->bpi.Load() == 0) { p->pclass |= PCLASS_LOADED; if (CallService(MS_SERVICEMODE_LAUNCH, 0, 0) != CALLSERVICE_NOTFOUND) return 1; @@ -641,7 +639,7 @@ int LoadNewPluginsModule(void) // if Crash Dumper is present, load it to provide Crash Reports if (pluginList_crshdmp != NULL && isPluginOnWhiteList(pluginList_crshdmp->pluginname)) { - if (pluginList_crshdmp->bpi.Load(&pluginCoreLink) == 0) + if (pluginList_crshdmp->bpi.Load() == 0) pluginList_crshdmp->pclass |= PCLASS_LOADED | PCLASS_LAST; else Plugin_Uninit(pluginList_crshdmp); @@ -654,7 +652,7 @@ int LoadNewPluginsModule(void) if (checkAPI(exe, &bpi, mirandaVersion, CHECKAPI_NONE)) { pluginList_freeimg->bpi = bpi; pluginList_freeimg->pclass |= PCLASS_OK | PCLASS_BASICAPI; - if (bpi.Load(&pluginCoreLink) == 0) + if (bpi.Load() == 0) pluginList_freeimg->pclass |= PCLASS_LOADED; else Plugin_Uninit(pluginList_freeimg); @@ -714,33 +712,6 @@ int LoadNewPluginsModuleInfos(void) CreateServiceFunction(MS_PLUGINS_ENUMDBPLUGINS, PluginsEnum); CreateServiceFunction(MS_PLUGINS_GETDISABLEDEFAULTARRAY, PluginsGetDefaultArray); - // make sure plugins can get internal core APIs - pluginCoreLink.CallService = CallService; - pluginCoreLink.ServiceExists = ServiceExists; - pluginCoreLink.CreateServiceFunction = CreateServiceFunction; - pluginCoreLink.CreateServiceFunctionParam = CreateServiceFunctionParam; - pluginCoreLink.CreateServiceFunctionObj = CreateServiceFunctionObj; - pluginCoreLink.CreateServiceFunctionObjParam = CreateServiceFunctionObjParam; - pluginCoreLink.CreateTransientServiceFunction = CreateServiceFunction; - pluginCoreLink.DestroyServiceFunction = DestroyServiceFunction; - pluginCoreLink.CreateHookableEvent = CreateHookableEvent; - pluginCoreLink.DestroyHookableEvent = DestroyHookableEvent; - pluginCoreLink.HookEvent = HookEvent; - pluginCoreLink.HookEventParam = HookEventParam; - pluginCoreLink.HookEventObj = HookEventObj; - pluginCoreLink.HookEventObjParam = HookEventObjParam; - pluginCoreLink.HookEventMessage = HookEventMessage; - pluginCoreLink.UnhookEvent = UnhookEvent; - pluginCoreLink.NotifyEventHooks = NotifyEventHooks; - pluginCoreLink.SetHookDefaultForHookableEvent = SetHookDefaultForHookableEvent; - pluginCoreLink.CallServiceSync = CallServiceSync; - pluginCoreLink.CallFunctionAsync = CallFunctionAsync; - pluginCoreLink.NotifyEventHooksDirect = CallHookSubscribers; - pluginCoreLink.CallProtoService = CallProtoService; - pluginCoreLink.CallContactService = CallContactService; - pluginCoreLink.KillObjectServices = KillObjectServices; - pluginCoreLink.KillObjectEventHooks = KillObjectEventHooks; - // remember where the mirandaboot.ini goes PathToAbsoluteT(_T("mirandaboot.ini"), mirandabootini, NULL); // look for all *.dll's diff --git a/src/modules/plugins/plugins.h b/src/modules/plugins/plugins.h index aa0251ab97..686f0e0963 100644 --- a/src/modules/plugins/plugins.h +++ b/src/modules/plugins/plugins.h @@ -9,14 +9,14 @@ #define DEFMOD_REMOVED_PROTOCOLNETLIB 22 // basic export prototypes -typedef int (__cdecl * Miranda_Plugin_Load) (PLUGINLINK *); +typedef int (__cdecl * Miranda_Plugin_Load) (void); typedef int (__cdecl * Miranda_Plugin_Unload) (void); // version control typedef PLUGININFOEX * (__cdecl * Miranda_Plugin_InfoEx) (DWORD mirandaVersion); // prototype for databases typedef DATABASELINK * (__cdecl * Database_Plugin_Info) (void * reserved); // prototype for clists -typedef int (__cdecl * CList_Initialise) (PLUGINLINK *); +typedef int (__cdecl * CList_Initialise) (void); // Interface support typedef MUUID * (__cdecl * Miranda_Plugin_Interfaces) (void); diff --git a/src/modules/utils/md5.cpp b/src/modules/utils/md5.cpp deleted file mode 100644 index 1ab0184e3e..0000000000 --- a/src/modules/utils/md5.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - L. Peter Deutsch - ghost@aladdin.com - - */ -/* $Id: md5.c 2874 2006-05-16 21:38:00Z ghazan $ */ -/* - Independent implementation of MD5 (RFC 1321). - - This code implements the MD5 Algorithm defined in RFC 1321, whose - text is available at - http://www.ietf.org/rfc/rfc1321.txt - The code is derived from the text of the RFC, including the test suite - (section A.5) but excluding the rest of Appendix A. It does not include - any code or documentation that is identified in the RFC as being - copyrighted. - - The original and principal author of md5.c is L. Peter Deutsch - . Other authors are noted in the change history - that follows (in reverse chronological order): - - 2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order - either statically or dynamically; added missing #include - in library. - 2002-03-11 lpd Corrected argument list for main(), and added int return - type, in test program and T value program. - 2002-02-21 lpd Added missing #include in test program. - 2000-07-03 lpd Patched to eliminate warnings about "constant is - unsigned in ANSI C, signed in traditional"; made test program - self-checking. - 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. - 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). - 1999-05-03 lpd Original version. - */ - -// (C) 2005 Joe @ Whale - changed to compile with Miranda - -#include "..\..\core\commonheaders.h" - -struct MD5_INTERFACE -{ - int cbSize; - void (*md5_init) (mir_md5_state_t *pms); - void (*md5_append) (mir_md5_state_t *pms, const mir_md5_byte_t *data, int nbytes); - void (*md5_finish) (mir_md5_state_t *pms, mir_md5_byte_t digest[16]); - void (*md5_hash) (const mir_md5_byte_t *data, int len, mir_md5_byte_t digest[16]); -}; - -INT_PTR GetMD5Interface(WPARAM, LPARAM lParam) -{ - struct MD5_INTERFACE *md5i = (struct MD5_INTERFACE*) lParam; - if (md5i == NULL) - return 1; - if (md5i->cbSize != sizeof(struct MD5_INTERFACE)) - return 1; - - md5i->md5_init = mir_md5_init; - md5i->md5_append = mir_md5_append; - md5i->md5_finish = mir_md5_finish; - md5i->md5_hash = mir_md5_hash; - return 0; -} diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp index 3ed6446003..bb0a60c67f 100644 --- a/src/modules/utils/utils.cpp +++ b/src/modules/utils/utils.cpp @@ -37,9 +37,6 @@ void InitXmlApi(void); void InitTimeZones(void); void UninitTimeZones(void); -INT_PTR GetMD5Interface(WPARAM, LPARAM); -INT_PTR GetSHA1Interface(WPARAM, LPARAM); - static BOOL bModuleInitialized = FALSE; static struct CountryListEntry countries[]={ @@ -476,7 +473,6 @@ int LoadUtilsModule(void) CreateServiceFunction(MS_UTILS_GETCOUNTRYLIST, GetCountryList); CreateServiceFunction(MS_UTILS_GETRANDOM, GenerateRandom); CreateServiceFunction(MS_SYSTEM_RESTART, RestartMiranda); - CreateServiceFunction(MS_SYSTEM_GET_MD5I, GetMD5Interface); InitOpenUrl(); InitWindowList(); InitHyperlink(); -- cgit v1.2.3