CMPlugin to receive a reference to PLUGININFOEX

14 files changed, 51 insertions, 51 deletions

diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp
index e7be5f4157..7a95027d2a 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.cpp
+++ b/plugins/CloudFile/src/Services/dropbox_service.cpp
@@ -119,7 +119,7 @@ void CDropboxService::HandleJsonError(JSONNode &node)
 auto CDropboxService::UploadFile(const char *data, size_t size, const std::string &path)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	DropboxAPI::UploadFileRequest request(token, path.c_str(), data, size, (OnConflict)strategy);
 	NLHR_PTR response(request.Send(m_hConnection));
 
@@ -148,7 +148,7 @@ void CDropboxService::UploadFileChunk(const std::string &sessionId, const char *
 auto CDropboxService::CommitUploadSession(const std::string &sessionId, const char *data, size_t size, size_t offset, const std::string &path)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	DropboxAPI::CommitUploadSessionRequest request(token, sessionId.c_str(), offset, path.c_str(), data, size, (OnConflict)strategy);
 	NLHR_PTR response(request.Send(m_hConnection));
 
@@ -289,7 +289,7 @@ void CDropboxService::Upload(FileTransferParam *ftp)
 struct CMPluginDropbox : public PLUGIN<CMPluginDropbox>
 {
 	CMPluginDropbox() :
-		PLUGIN<CMPluginDropbox>(MODULE "/Dropbox")
+		PLUGIN<CMPluginDropbox>(MODULENAME "/Dropbox", pluginInfoEx)
 	{
 		m_hInst = g_plugin.getInst();
 
diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp
index 798981a9c9..906e9e817d 100644
--- a/plugins/CloudFile/src/Services/google_service.cpp
+++ b/plugins/CloudFile/src/Services/google_service.cpp
@@ -286,7 +286,7 @@ void CGDriveService::Upload(FileTransferParam *ftp)
 struct CMPluginGoogle : public CMPluginBase
 {
 	CMPluginGoogle() :
-		CMPluginBase(MODULE "/GDrive")
+		CMPluginBase(MODULENAME "/GDrive", pluginInfoEx)
 	{
 		m_hInst = g_plugin.getInst();
 
diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp
index 722560aec8..5adf66649a 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.cpp
+++ b/plugins/CloudFile/src/Services/microsoft_service.cpp
@@ -140,7 +140,7 @@ void COneDriveService::HandleJsonError(JSONNode &node)
 auto COneDriveService::UploadFile(const std::string &parentId, const std::string &fileName, const char *data, size_t size)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	OneDriveAPI::UploadFileRequest *request = !parentId.empty()
 		? new OneDriveAPI::UploadFileRequest(token, parentId.c_str(), fileName.c_str(), data, size, (OnConflict)strategy)
 		: new OneDriveAPI::UploadFileRequest(token, fileName.c_str(), data, size, (OnConflict)strategy);
@@ -154,7 +154,7 @@ auto COneDriveService::UploadFile(const std::string &parentId, const std::string
 auto COneDriveService::CreateUploadSession(const std::string &parentId, const std::string &fileName)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	OneDriveAPI::CreateUploadSessionRequest *request = !parentId.empty()
 		? new OneDriveAPI::CreateUploadSessionRequest(token, parentId.c_str(), fileName.c_str(), (OnConflict)strategy)
 		: new OneDriveAPI::CreateUploadSessionRequest(token, fileName.c_str(), (OnConflict)strategy);
@@ -259,7 +259,7 @@ void COneDriveService::Upload(FileTransferParam *ftp)
 struct CMPluginOnedrive : public CMPluginBase
 {
 	CMPluginOnedrive() :
-		CMPluginBase(MODULE "/OneDrive")
+		CMPluginBase(MODULENAME "/OneDrive", pluginInfoEx)
 	{
 		m_hInst = g_plugin.getInst();
 
diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp
index 6609e7c4b3..c5dbb50400 100644
--- a/plugins/CloudFile/src/Services/yandex_service.cpp
+++ b/plugins/CloudFile/src/Services/yandex_service.cpp
@@ -153,7 +153,7 @@ void CYandexService::HandleJsonError(JSONNode &node)
 auto CYandexService::CreateUploadSession(const std::string &path)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	YandexAPI::GetUploadUrlRequest request(token, path.c_str(), (OnConflict)strategy);
 	NLHR_PTR response(request.Send(m_hConnection));
 
@@ -280,7 +280,7 @@ void CYandexService::Upload(FileTransferParam *ftp)
 struct CMPluginYandex : public CMPluginBase
 {
 	CMPluginYandex() :
-		CMPluginBase(MODULE "/YandexDisk")
+		CMPluginBase(MODULENAME "/YandexDisk", pluginInfoEx)
 	{
 		m_hInst = g_plugin.getInst();
 
diff --git a/plugins/CloudFile/src/events.cpp b/plugins/CloudFile/src/events.cpp
index f8770b5574..08bbd2974d 100644
--- a/plugins/CloudFile/src/events.cpp
+++ b/plugins/CloudFile/src/events.cpp
@@ -13,7 +13,7 @@ static int OnProtoAck(WPARAM, LPARAM lParam)
 			continue;
 
 		BBButton bbd = {};
-		bbd.pszModuleName = MODULE;
+		bbd.pszModuleName = MODULENAME;
 		bbd.dwButtonID = BBB_ID_FILE_SEND;
 		bbd.bbbFlags = CanSendToContact(hContact)
 			? BBSF_RELEASED
diff --git a/plugins/CloudFile/src/file_transfer.h b/plugins/CloudFile/src/file_transfer.h
index 95ce0aa120..692e717f2e 100644
--- a/plugins/CloudFile/src/file_transfer.h
+++ b/plugins/CloudFile/src/file_transfer.h
@@ -43,7 +43,7 @@ public:
 		pfts.szWorkingDir.w = NULL;
 		pfts.szCurrentFile.w = NULL;
 
-		ProtoBroadcastAck(MODULE, pfts.hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (HANDLE)id, 0);
+		ProtoBroadcastAck(MODULENAME, pfts.hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (HANDLE)id, 0);
 	}
 
 	~FileTransferParam()
@@ -210,7 +210,7 @@ public:
 		pfts.currentFileProgress += count;
 		pfts.totalProgress += count;
 		if (pfts.hContact)
-			ProtoBroadcastAck(MODULE, pfts.hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)id, (LPARAM)&pfts);
+			ProtoBroadcastAck(MODULENAME, pfts.hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)id, (LPARAM)&pfts);
 	}
 
 	void FirstFile()
@@ -221,7 +221,7 @@ public:
 		pfts.currentFileProgress = 0;
 		pfts.szCurrentFile.w = wcsrchr(pfts.pszFiles.w[pfts.currentFileNumber], '\\') + 1;
 		if (pfts.hContact)
-			ProtoBroadcastAck(MODULE, pfts.hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)id, (LPARAM)&pfts);
+			ProtoBroadcastAck(MODULENAME, pfts.hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)id, (LPARAM)&pfts);
 
 		OpenCurrentFile();
 		CheckCurrentFile();
@@ -237,7 +237,7 @@ public:
 		pfts.currentFileProgress = 0;
 		pfts.szCurrentFile.w = wcsrchr(pfts.pszFiles.w[pfts.currentFileNumber], '\\') + 1;
 		if (pfts.hContact)
-			ProtoBroadcastAck(MODULE, pfts.hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (HANDLE)id, 0);
+			ProtoBroadcastAck(MODULENAME, pfts.hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (HANDLE)id, 0);
 
 		OpenCurrentFile();
 		CheckCurrentFile();
@@ -248,7 +248,7 @@ public:
 	void SetStatus(int status, LPARAM param = 0)
 	{
 		if (pfts.hContact)
-			ProtoBroadcastAck(MODULE, pfts.hContact, ACKTYPE_FILE, status, (HANDLE)id, param);
+			ProtoBroadcastAck(MODULENAME, pfts.hContact, ACKTYPE_FILE, status, (HANDLE)id, param);
 	}
 };
 
diff --git a/plugins/CloudFile/src/icons.cpp b/plugins/CloudFile/src/icons.cpp
index 10ec5cba9f..001df50240 100644
--- a/plugins/CloudFile/src/icons.cpp
+++ b/plugins/CloudFile/src/icons.cpp
@@ -11,7 +11,7 @@ static IconItem iconList[] =
 
 void InitializeIcons()
 {
-	g_plugin.registerIcon("Protocols/" MODULE, iconList, MODULE);
+	g_plugin.registerIcon("Protocols/" MODULENAME, iconList, MODULENAME);
 }
 
 HANDLE GetIconHandle(int iconId)
diff --git a/plugins/CloudFile/src/main.cpp b/plugins/CloudFile/src/main.cpp
index c3c6cb7be9..3ca65743d4 100644
--- a/plugins/CloudFile/src/main.cpp
+++ b/plugins/CloudFile/src/main.cpp
@@ -1,8 +1,9 @@
 #include "stdafx.h"
 
+CMPlugin g_plugin;
 int &hLangpack(g_plugin.m_hLang);
 
-PLUGININFOEX pluginInfo =
+PLUGININFOEX pluginInfoEx =
 {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
@@ -16,16 +17,16 @@ PLUGININFOEX pluginInfo =
 	{ 0xe876fe63, 0x701, 0x4cda, { 0xbe, 0xd5, 0x7c, 0x73, 0xa3, 0x79, 0xc1, 0xd1 }}
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-
-CMPlugin g_plugin;
-
-/////////////////////////////////////////////////////////////////////////////////////////
 // Interface information
 
 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };
@@ -34,7 +35,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 
 extern "C" int __declspec(dllexport) Load(void)
 {
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
 
diff --git a/plugins/CloudFile/src/menus.cpp b/plugins/CloudFile/src/menus.cpp
index fed19569f6..b05b9d5e87 100644
--- a/plugins/CloudFile/src/menus.cpp
+++ b/plugins/CloudFile/src/menus.cpp
@@ -15,12 +15,12 @@ void InitializeMenus()
 	SET_UID(mi, 0x93d4495b, 0x259b, 0x4fba, 0xbc, 0x14, 0xf9, 0x46, 0x2c, 0xda, 0xfc, 0x6d);
 	mi.name.a = LPGEN("Upload to...");
 
-	ptrA defaultService(db_get_sa(NULL, MODULE, "DefaultService"));
+	ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService"));
 	if (defaultService) {
 		CCloudService *service = FindService(defaultService);
 		if (service) {
 			mi.name.a = LPGEN("Upload");
-			mi.pszService = MODULE "/Default/Upload";
+			mi.pszService = MODULENAME "/Default/Upload";
 			CreateServiceFunctionObj(mi.pszService, UploadMenuCommand, service);
 		}
 	}
diff --git a/plugins/CloudFile/src/options.cpp b/plugins/CloudFile/src/options.cpp
index ef643b0e50..1277aed11c 100644
--- a/plugins/CloudFile/src/options.cpp
+++ b/plugins/CloudFile/src/options.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 COptionsMainDlg::COptionsMainDlg()
-	: CPluginDlgBase(g_plugin, IDD_OPTIONS_MAIN, MODULE),
+	: CPluginDlgBase(g_plugin, IDD_OPTIONS_MAIN, MODULENAME),
 	m_defaultService(this, IDC_DEFAULTSERVICE),
 	m_doNothingOnConflict(this, IDC_DONOTHINGONCONFLICT),
 	m_renameOnConflict(this, IDC_RENAMEONCONFLICT),
@@ -21,7 +21,7 @@ void COptionsMainDlg::OnInitDialog()
 {
 	CDlgBase::OnInitDialog();
 
-	ptrA defaultService(db_get_sa(NULL, MODULE, "DefaultService"));
+	ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService"));
 	int iItem = m_defaultService.AddString(TranslateT("None"));
 	m_defaultService.SetCurSel(iItem);
 
@@ -31,7 +31,7 @@ void COptionsMainDlg::OnInitDialog()
 			m_defaultService.SetCurSel(iItem);
 	}
 
-	BYTE strategy = db_get_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	switch (strategy)
 	{
 	case OnConflict::RENAME:
@@ -57,16 +57,16 @@ void COptionsMainDlg::OnApply()
 	int iItem = m_defaultService.GetCurSel();
 	CCloudService *service = (CCloudService*)m_defaultService.GetItemData(iItem);
 	if (service)
-		db_set_s(NULL, MODULE, "DefaultService", service->GetAccountName());
+		db_set_s(NULL, MODULENAME, "DefaultService", service->GetAccountName());
 	else
-		db_unset(NULL, MODULE, "DefaultService");
+		db_unset(NULL, MODULENAME, "DefaultService");
 
 	if (m_renameOnConflict.GetState())
-		db_set_b(NULL, MODULE, "ConflictStrategy", OnConflict::RENAME);
+		db_set_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::RENAME);
 	else if (m_repalceOnConflict.GetState())
-		db_set_b(NULL, MODULE, "ConflictStrategy", OnConflict::REPLACE);
+		db_set_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
 	else
-		db_unset(NULL, MODULE, "ConflictStrategy");
+		db_unset(NULL, MODULENAME, "ConflictStrategy");
 }
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ void COptionsMainDlg::OnApply()
 int OnOptionsInitialized(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.szTitle.w = _A2W(MODULE);
+	odp.szTitle.w = _A2W(MODULENAME);
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
 	odp.szGroup.w = LPGENW("Services");
 
diff --git a/plugins/CloudFile/src/services.cpp b/plugins/CloudFile/src/services.cpp
index d367dc1fe8..9f1867cb6e 100644
--- a/plugins/CloudFile/src/services.cpp
+++ b/plugins/CloudFile/src/services.cpp
@@ -24,7 +24,7 @@ static INT_PTR GetService(WPARAM wParam, LPARAM lParam)
 
 	ptrA accountName(mir_strdup((char*)wParam));
 	if (!accountName || !mir_strlen(accountName))
-		accountName = db_get_sa(NULL, MODULE, "DefaultService");
+		accountName = db_get_sa(NULL, MODULENAME, "DefaultService");
 	if (accountName == nullptr)
 		return 2;
 
@@ -63,7 +63,7 @@ INT_PTR Upload(WPARAM wParam, LPARAM lParam)
 
 	ptrA accountName(mir_strdup(uploadData->accountName));
 	if (!mir_strlen(accountName))
-		accountName = db_get_sa(NULL, MODULE, "DefaultService");
+		accountName = db_get_sa(NULL, MODULENAME, "DefaultService");
 	if (accountName == nullptr)
 		return 2;
 
@@ -96,9 +96,9 @@ INT_PTR Upload(WPARAM wParam, LPARAM lParam)
 
 void InitializeServices()
 {
-	Proto_RegisterModule(PROTOTYPE_FILTER, MODULE);
+	Proto_RegisterModule(PROTOTYPE_FILTER, MODULENAME);
 
-	CreateServiceFunction(MODULE PSS_FILE, SendFileInterceptor);
+	CreateServiceFunction(MODULENAME PSS_FILE, SendFileInterceptor);
 
 	CreateServiceFunction(MS_CLOUDFILE_GETSERVICE, GetService);
 	CreateServiceFunction(MS_CLOUDFILE_ENUMSERVICES, EnumServices);
diff --git a/plugins/CloudFile/src/srmm.cpp b/plugins/CloudFile/src/srmm.cpp
index 2a49cdb7ef..fd90be1d6c 100644
--- a/plugins/CloudFile/src/srmm.cpp
+++ b/plugins/CloudFile/src/srmm.cpp
@@ -3,7 +3,7 @@
 int OnSrmmToolbarLoaded(WPARAM, LPARAM)
 {
 	BBButton bbd = {};
-	bbd.pszModuleName = MODULE;
+	bbd.pszModuleName = MODULENAME;
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_ISARROWBUTTON;
 
 	CMStringW tooltip(FORMAT, TranslateT("Upload files to..."));
@@ -21,7 +21,7 @@ int OnSrmmWindowOpened(WPARAM, LPARAM lParam)
 	MessageWindowEventData *ev = (MessageWindowEventData*)lParam;
 	if (ev->uType == MSG_WINDOW_EVT_OPENING && ev->hContact) {
 		BBButton bbd = {};
-		bbd.pszModuleName = MODULE;
+		bbd.pszModuleName = MODULENAME;
 		bbd.dwButtonID = BBB_ID_FILE_SEND;
 		bbd.bbbFlags = CanSendToContact(ev->hContact)
 			? BBSF_RELEASED
@@ -36,14 +36,14 @@ int OnSrmmButtonPressed(WPARAM, LPARAM lParam)
 {
 	CustomButtonClickData *cbc = (CustomButtonClickData*)lParam;
 
-	if (mir_strcmp(cbc->pszModule, MODULE))
+	if (mir_strcmp(cbc->pszModule, MODULENAME))
 		return 0;
 
 	if (cbc->dwButtonId != BBB_ID_FILE_SEND)
 		return 0;
 
 	if (cbc->flags != BBCF_ARROWCLICKED) {
-		ptrA defaultService(db_get_sa(NULL, MODULE, "DefaultService"));
+		ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService"));
 		if (defaultService) {
 			CCloudService *service = FindService(defaultService);
 			if (service)
diff --git a/plugins/CloudFile/src/stdafx.h b/plugins/CloudFile/src/stdafx.h
index 7a54a943b9..cc8ce7c9f6 100644
--- a/plugins/CloudFile/src/stdafx.h
+++ b/plugins/CloudFile/src/stdafx.h
@@ -42,6 +42,7 @@ class CCloudService;
 #include "options.h"
 
 extern HNETLIBUSER hNetlibConnection;
+extern PLUGININFOEX pluginInfoEx;
 
 class Exception
 {
@@ -59,7 +60,7 @@ public:
 	}
 };
 
-#define MODULE "CloudFile"
+#define MODULENAME "CloudFile"
 
 #define FILE_CHUNK_SIZE 1024 * 1024 //1 MB
 
@@ -118,9 +119,7 @@ CCloudService* FindService(const char *szProto);
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(MODULE)
-	{}
+	CMPlugin();
 };
 
 #endif //_COMMON_H_
\ No newline at end of file
diff --git a/plugins/CloudFile/src/utils.cpp b/plugins/CloudFile/src/utils.cpp
index cb9bb8bf94..22611fe539 100644
--- a/plugins/CloudFile/src/utils.cpp
+++ b/plugins/CloudFile/src/utils.cpp
@@ -21,13 +21,13 @@ void ShowNotification(const wchar_t *caption, const wchar_t *message, int flags,
 
 void ShowNotification(const wchar_t *message, int flags, MCONTACT hContact)
 {
-	ShowNotification(_A2W(MODULE), message, flags, hContact);
+	ShowNotification(_A2W(MODULENAME), message, flags, hContact);
 }
 
 MEVENT AddEventToDb(MCONTACT hContact, WORD type, DWORD flags, DWORD cbBlob, PBYTE pBlob)
 {
 	DBEVENTINFO dbei = {};
-	dbei.szModule = MODULE;
+	dbei.szModule = MODULENAME;
 	dbei.timestamp = time(0);
 	dbei.eventType = type;
 	dbei.cbBlob = cbBlob;
@@ -102,12 +102,12 @@ void PasteToClipboard(const wchar_t *data)
 
 void Report(MCONTACT hContact, const wchar_t *data)
 {
-	if (db_get_b(NULL, MODULE, "UrlAutoSend", 1))
+	if (db_get_b(NULL, MODULENAME, "UrlAutoSend", 1))
 		SendToContact(hContact, data);
 
-	if (db_get_b(NULL, MODULE, "UrlPasteToMessageInputArea", 0))
+	if (db_get_b(NULL, MODULENAME, "UrlPasteToMessageInputArea", 0))
 		PasteToInputArea(hContact, data);
 
-	if (db_get_b(NULL, MODULE, "UrlCopyToClipboard", 0))
+	if (db_get_b(NULL, MODULENAME, "UrlCopyToClipboard", 0))
 		PasteToClipboard(data);
 }