From b93e076795f7998aef8a63f7602998cdc6632a80 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Feb 2013 12:15:06 +0000 Subject: core: copyright update to year 2013 git-svn-id: http://svn.miranda-ng.org/main/trunk@3549 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/plugins/dll_sniffer.cpp | 11 ++++++----- src/modules/plugins/newplugins.cpp | 21 +++++++++++---------- src/modules/plugins/pluginopts.cpp | 13 +++++++------ 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'src/modules/plugins') diff --git a/src/modules/plugins/dll_sniffer.cpp b/src/modules/plugins/dll_sniffer.cpp index 299fb9cd3a..7092b8dc4d 100644 --- a/src/modules/plugins/dll_sniffer.cpp +++ b/src/modules/plugins/dll_sniffer.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #include "..\..\core\commonheaders.h" #include "plugins.h" @@ -30,7 +31,7 @@ static IMAGE_SECTION_HEADER *getSectionByRVA(IMAGE_SECTION_HEADER *pISH, int nSe return pISH; return NULL; -} +} MUUID* GetPluginInterfaces(const TCHAR* ptszFileName, bool& bIsPlugin) { @@ -78,14 +79,14 @@ MUUID* GetPluginInterfaces(const TCHAR* ptszFileName, bool& bIsPlugin) INT_PTR base; PIMAGE_DATA_DIRECTORY pIDD; - if ( pINTH->FileHeader.Machine == IMAGE_FILE_MACHINE_I386 && + if ( pINTH->FileHeader.Machine == IMAGE_FILE_MACHINE_I386 && pINTH->FileHeader.SizeOfOptionalHeader >= sizeof(IMAGE_OPTIONAL_HEADER32) && pINTH->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { pIDD = (PIMAGE_DATA_DIRECTORY)( (PBYTE)pINTH + offsetof( IMAGE_NT_HEADERS32, OptionalHeader.DataDirectory )); base = *(DWORD*)((PBYTE)pINTH + offsetof(IMAGE_NT_HEADERS32, OptionalHeader.ImageBase)); - } - else if ( pINTH->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64 && + } + else if ( pINTH->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64 && pINTH->FileHeader.SizeOfOptionalHeader >= sizeof(IMAGE_OPTIONAL_HEADER64) && pINTH->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index c80db5c948..7b3ef4b408 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #include "..\..\core\commonheaders.h" #include "plugins.h" @@ -86,7 +87,7 @@ bool hasMuuid(const BASIC_PLUGIN_INFO& bpi, const MUUID& uuid) ///////////////////////////////////////////////////////////////////////////////////////// // banned plugins -static const MUUID pluginBannedList[] = +static const MUUID pluginBannedList[] = { {0x9d6c3213, 0x02b4, 0x4fe1, { 0x92, 0xe6, 0x52, 0x6d, 0xe2, 0x4f, 0x8d, 0x65 }}, // old chat {0x240a91dc, 0x9464, 0x457a, { 0x97, 0x87, 0xff, 0x1e, 0xa8, 0x8e, 0x77, 0xe3 }}, // old clist @@ -106,7 +107,7 @@ static bool isPluginBanned(const MUUID& u1) ///////////////////////////////////////////////////////////////////////////////////////// // default plugins -static MuuidReplacement pluginDefault[] = +static MuuidReplacement pluginDefault[] = { { MIID_UIUSERINFO, _T("stduserinfo"), NULL }, // 0 { MIID_SRURL, _T("stdurl"), NULL }, // 1 @@ -158,7 +159,7 @@ int LoadStdPlugins() char* GetPluginNameByInstance(HINSTANCE hInstance) { - if (pluginList.getCount() == 0) + if (pluginList.getCount() == 0) return NULL; for (int i=0; i < pluginList.getCount(); i++) { @@ -171,7 +172,7 @@ char* GetPluginNameByInstance(HINSTANCE hInstance) int GetPluginLangByInstance(HINSTANCE hInstance) { - if (pluginList.getCount() == 0) + if (pluginList.getCount() == 0) return NULL; for (int i=0; i < pluginList.getCount(); i++) { @@ -192,7 +193,7 @@ int GetPluginFakeId(const MUUID &uuid, int hLangpack) if ( equalUUID(p->bpi.pluginInfo->uuid, uuid)) return p->hLangpack = (hLangpack) ? hLangpack : --sttFakeID; } - + return 0; } @@ -220,14 +221,14 @@ static bool validInterfaceList(MUUID *piface) * storage */ -static const TCHAR* modulesToSkip[] = +static const TCHAR* modulesToSkip[] = { _T("autoloadavatars.dll"), _T("multiwindow.dll"), _T("fontservice.dll"), _T("icolib.dll"), _T("historyeditor.dll") }; // The following plugins will be checked for a valid MUUID or they will not be loaded -static const TCHAR* expiredModulesToSkip[] = +static const TCHAR* expiredModulesToSkip[] = { _T("scriver.dll"), _T("nconvers.dll"), _T("tabsrmm.dll"), _T("nhistory.dll"), _T("historypp.dll"), _T("help.dll"), _T("loadavatars.dll"), _T("tabsrmm_unicode.dll"), @@ -453,7 +454,7 @@ pluginEntry* OpenPlugin(TCHAR *tszFileName, TCHAR *dir, TCHAR *path) clistPlugins.insert(p); p->pclass |= PCLASS_CLIST; } - // plugin declared that it's a service mode plugin. + // plugin declared that it's a service mode plugin. // load it for a profile manager's window else if ( hasMuuid(pIds, miid_servicemode)) { BASIC_PLUGIN_INFO bpi; @@ -518,7 +519,7 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic) p->pclass |= PCLASS_FAILED; return false; } - + p->bpi = bpi; p->pclass |= PCLASS_OK | PCLASS_BASICAPI; } diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index e8c946b510..5c9feb5b38 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #include "..\..\core\commonheaders.h" #include @@ -133,7 +134,7 @@ static int uuidToString(const MUUID uuid, char *szStr, int cbLen) if (cbLen < 1 || !szStr) return 0; - mir_snprintf(szStr, cbLen, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + mir_snprintf(szStr, cbLen, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", uuid.a, uuid.b, uuid.c, uuid.d[0], uuid.d[1], uuid.d[2], uuid.d[3], uuid.d[4], uuid.d[5], uuid.d[6], uuid.d[7]); return 1; } @@ -226,7 +227,7 @@ static LRESULT CALLBACK PluginListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LP static int CALLBACK SortPlugins(WPARAM i1, LPARAM i2, LPARAM lParamSort) { - PluginListItemData *p1 = (PluginListItemData*)i1, *p2 = (PluginListItemData*)i2; + PluginListItemData *p1 = (PluginListItemData*)i1, *p2 = (PluginListItemData*)i2; return _tcscmp(p1->fileName, p2->fileName); } @@ -363,7 +364,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar mir_ptr tszEmail( latin2t(sel ? dat->authorEmail : NULL)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINEMAIL), tszEmail); - + mir_ptr p( Langpack_PcharToTchar(dat->description)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINLONGINFO), sel ? (TCHAR*)p : _T("")); @@ -386,7 +387,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar TCHAR bufRestart[1024]; int bufLen = mir_sntprintf(bufRestart, SIZEOF(bufRestart), _T("%s\n"), TranslateT("Miranda NG must be restarted to apply changes for these plugins:")); - HWND hwndList = GetDlgItem(hwndDlg, IDC_PLUGLIST); + HWND hwndList = GetDlgItem(hwndDlg, IDC_PLUGLIST); TCHAR buf[1024]; for (int iRow = 0; iRow != -1;) { ListView_GetItemText(hwndList, iRow, 2, buf, SIZEOF(buf)); @@ -428,7 +429,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar } } } - + iRow = ListView_GetNextItem(hwndList, iRow, LVNI_ALL); } ShowWindow( GetDlgItem(hwndDlg, IDC_RESTART), needRestart); -- cgit v1.2.3