CMPlugin to receive a reference to PLUGININFOEX

5 files changed, 47 insertions, 45 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index 2945dce91e..356d3d5fdf 100644
--- a/plugins/SendScreenshotPlus/src/CSend.cpp
+++ b/plugins/SendScreenshotPlus/src/CSend.cpp
@@ -391,7 +391,7 @@ void CSend::Error(LPCTSTR pszFormat, ...)
 {
 	wchar_t tszMsg[MAX_SECONDLINE];
 
-	mir_snwprintf(tszMsg, L"%s - %s", _A2W(SZ_SENDSS), TranslateT("Error"));
+	mir_snwprintf(tszMsg, L"%s - %s", _A2W(MODULENAME), TranslateT("Error"));
 	mir_free(m_ErrorTitle), m_ErrorTitle = mir_wstrdup(tszMsg);
 
 	va_list vl;
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index f0c42d7093..c479946d96 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -209,7 +209,7 @@ INT_PTR service_Send2ImageShack(WPARAM wParam, LPARAM lParam)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static PLUGININFOEX pluginInfo =
+static PLUGININFOEX pluginInfoEx =
 {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
@@ -223,9 +223,13 @@ static PLUGININFOEX pluginInfo =
 	{ 0xed39af7c, 0xbecd, 0x404e, { 0x94, 0x99, 0x4d, 0x04, 0xf7, 0x11, 0xb9, 0xcb } }
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -267,7 +271,7 @@ ATOM g_clsTargetHighlighter = 0;
 
 extern "C" __declspec(dllexport) int Load(void)
 {
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 	pci = Chat_GetInterface();
 
 	/// hook events
@@ -275,13 +279,13 @@ extern "C" __declspec(dllexport) int Load(void)
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, hook_SystemPreShutdown);
 	
 	/// icons
-	g_plugin.registerIcon(SZ_SENDSS, ICONS, SZ_SENDSS);
-	g_plugin.registerIcon(SZ_SENDSS "/" LPGEN("Buttons"), ICONS_BTN, SZ_SENDSS);
+	g_plugin.registerIcon(MODULENAME, ICONS, MODULENAME);
+	g_plugin.registerIcon(MODULENAME "/" LPGEN("Buttons"), ICONS_BTN, MODULENAME);
 	
 	/// services
 #define srv_reg(name) do{\
-		m_h##name=CreateServiceFunction(SZ_SENDSS "/" #name, service_##name);\
-		if(!m_h##name) MessageBoxA(NULL,Translate("Could not register Miranda service."),SZ_SENDSS "/" #name,MB_OK|MB_ICONERROR|MB_APPLMODAL);\
+		m_h##name=CreateServiceFunction(MODULENAME "/" #name, service_##name);\
+		if(!m_h##name) MessageBoxA(NULL,Translate("Could not register Miranda service."),MODULENAME "/" #name,MB_OK|MB_ICONERROR|MB_APPLMODAL);\
 		}while(0)
 	srv_reg(OpenCaptureDialog);
 	srv_reg(SendDesktop);
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 145de2c080..398458cd85 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -749,54 +749,54 @@ TfrmMain::~TfrmMain()
 
 void TfrmMain::LoadOptions(void)
 {
-	DWORD rgb = db_get_dw(NULL, SZ_SENDSS, "AlphaColor", 16777215);
+	DWORD rgb = db_get_dw(NULL, MODULENAME, "AlphaColor", 16777215);
 	m_AlphaColor.rgbRed = GetRValue(rgb);
 	m_AlphaColor.rgbGreen = GetGValue(rgb);
 	m_AlphaColor.rgbBlue = GetBValue(rgb);
 	m_AlphaColor.rgbReserved = 0;
 
-	//	m_opt_chkEmulateClick		= db_get_b(NULL, SZ_SENDSS, "AutoSend", 1);
-	m_opt_edtQuality = db_get_b(NULL, SZ_SENDSS, "JpegQuality", 75);
+	//	m_opt_chkEmulateClick		= db_get_b(NULL, MODULENAME, "AutoSend", 1);
+	m_opt_edtQuality = db_get_b(NULL, MODULENAME, "JpegQuality", 75);
 
-	m_opt_tabCapture = db_get_b(NULL, SZ_SENDSS, "Capture", 0);
-	m_opt_chkIndirectCapture = db_get_b(NULL, SZ_SENDSS, "IndirectCapture", 0);
-	m_opt_chkClientArea = db_get_b(NULL, SZ_SENDSS, "ClientArea", 0);
-	m_opt_cboxDesktop = db_get_b(NULL, SZ_SENDSS, "Desktop", 0);
+	m_opt_tabCapture = db_get_b(NULL, MODULENAME, "Capture", 0);
+	m_opt_chkIndirectCapture = db_get_b(NULL, MODULENAME, "IndirectCapture", 0);
+	m_opt_chkClientArea = db_get_b(NULL, MODULENAME, "ClientArea", 0);
+	m_opt_cboxDesktop = db_get_b(NULL, MODULENAME, "Desktop", 0);
 
-	m_opt_chkTimed = db_get_b(NULL, SZ_SENDSS, "TimedCap", 0);
-	m_opt_edtTimed = db_get_b(NULL, SZ_SENDSS, "CapTime", 3);
-	m_opt_cboxFormat = db_get_b(NULL, SZ_SENDSS, "OutputFormat", 0);
-	m_opt_cboxSendBy = db_get_b(NULL, SZ_SENDSS, "SendBy", 0);
+	m_opt_chkTimed = db_get_b(NULL, MODULENAME, "TimedCap", 0);
+	m_opt_edtTimed = db_get_b(NULL, MODULENAME, "CapTime", 3);
+	m_opt_cboxFormat = db_get_b(NULL, MODULENAME, "OutputFormat", 0);
+	m_opt_cboxSendBy = db_get_b(NULL, MODULENAME, "SendBy", 0);
 
-	m_opt_btnDesc = db_get_b(NULL, SZ_SENDSS, "AutoDescription", 1);
-	m_opt_btnDeleteAfterSend = db_get_b(NULL, SZ_SENDSS, "DelAfterSend", 1) != 0;
-	m_opt_chkEditor = db_get_b(NULL, SZ_SENDSS, "Preview", 0);
-	m_opt_chkOpenAgain = db_get_b(NULL, SZ_SENDSS, "OpenAgain", 0);
+	m_opt_btnDesc = db_get_b(NULL, MODULENAME, "AutoDescription", 1);
+	m_opt_btnDeleteAfterSend = db_get_b(NULL, MODULENAME, "DelAfterSend", 1) != 0;
+	m_opt_chkEditor = db_get_b(NULL, MODULENAME, "Preview", 0);
+	m_opt_chkOpenAgain = db_get_b(NULL, MODULENAME, "OpenAgain", 0);
 }
 
 void TfrmMain::SaveOptions(void)
 {
 	if (m_bOnExitSave) {
-		db_set_dw(NULL, SZ_SENDSS, "AlphaColor",
+		db_set_dw(NULL, MODULENAME, "AlphaColor",
 			(DWORD)RGB(m_AlphaColor.rgbRed, m_AlphaColor.rgbGreen, m_AlphaColor.rgbBlue));
 
-		//		db_set_b(NULL, SZ_SENDSS, "AutoSend", m_opt_chkEmulateClick);
-		db_set_b(NULL, SZ_SENDSS, "JpegQuality", m_opt_edtQuality);
+		//		db_set_b(NULL, MODULENAME, "AutoSend", m_opt_chkEmulateClick);
+		db_set_b(NULL, MODULENAME, "JpegQuality", m_opt_edtQuality);
 
-		db_set_b(NULL, SZ_SENDSS, "Capture", m_opt_tabCapture);
-		db_set_b(NULL, SZ_SENDSS, "IndirectCapture", m_opt_chkIndirectCapture);
-		db_set_b(NULL, SZ_SENDSS, "ClientArea", m_opt_chkClientArea);
-		db_set_b(NULL, SZ_SENDSS, "Desktop", m_opt_cboxDesktop);
+		db_set_b(NULL, MODULENAME, "Capture", m_opt_tabCapture);
+		db_set_b(NULL, MODULENAME, "IndirectCapture", m_opt_chkIndirectCapture);
+		db_set_b(NULL, MODULENAME, "ClientArea", m_opt_chkClientArea);
+		db_set_b(NULL, MODULENAME, "Desktop", m_opt_cboxDesktop);
 
-		db_set_b(NULL, SZ_SENDSS, "TimedCap", m_opt_chkTimed);
-		db_set_b(NULL, SZ_SENDSS, "CapTime", m_opt_edtTimed);
-		db_set_b(NULL, SZ_SENDSS, "OutputFormat", m_opt_cboxFormat);
-		db_set_b(NULL, SZ_SENDSS, "SendBy", m_opt_cboxSendBy);
+		db_set_b(NULL, MODULENAME, "TimedCap", m_opt_chkTimed);
+		db_set_b(NULL, MODULENAME, "CapTime", m_opt_edtTimed);
+		db_set_b(NULL, MODULENAME, "OutputFormat", m_opt_cboxFormat);
+		db_set_b(NULL, MODULENAME, "SendBy", m_opt_cboxSendBy);
 
-		db_set_b(NULL, SZ_SENDSS, "AutoDescription", m_opt_btnDesc);
-		db_set_b(NULL, SZ_SENDSS, "DelAfterSend", m_opt_btnDeleteAfterSend);
-		db_set_b(NULL, SZ_SENDSS, "Preview", m_opt_chkEditor);
-		db_set_b(NULL, SZ_SENDSS, "OpenAgain", m_opt_chkOpenAgain);
+		db_set_b(NULL, MODULENAME, "AutoDescription", m_opt_btnDesc);
+		db_set_b(NULL, MODULENAME, "DelAfterSend", m_opt_btnDeleteAfterSend);
+		db_set_b(NULL, MODULENAME, "Preview", m_opt_chkEditor);
+		db_set_b(NULL, MODULENAME, "OpenAgain", m_opt_chkOpenAgain);
 	}
 }
 
@@ -992,7 +992,7 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP *dib)
 		return 1;		//error
 
 	// generate file name
-	unsigned FileNumber = db_get_dw(NULL, SZ_SENDSS, "FileNumber", 0) + 1;
+	unsigned FileNumber = db_get_dw(NULL, MODULENAME, "FileNumber", 0) + 1;
 	if (FileNumber > 99999)
 		FileNumber = 1;
 	
@@ -1080,7 +1080,7 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP *dib)
 	if (!ret)
 		return 1; // error
 	
-	db_set_dw(NULL, SZ_SENDSS, "FileNumber", FileNumber);
+	db_set_dw(NULL, MODULENAME, "FileNumber", FileNumber);
 	replaceStrW(m_pszFile, wszFileName);
 
 	if (!IsWindowEnabled(GetDlgItem(m_hWnd, ID_chkDesc)) || !m_opt_btnDesc)
diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
index e0a4be0666..82751abf8a 100644
--- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
+++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "stdafx.h"
 #define ghInst g_plugin.getInst()
 #define myGlobals g_myGlobals
-#define MODNAME SZ_SENDSS
+#define MODNAME MODULENAME
 #define ICO_COMMON_MAIN 0xFFFF
 #define ICO_DLG_DETAILS 0xFFFF
 
diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h
index 6d37f1d4ae..e6517b49c0 100644
--- a/plugins/SendScreenshotPlus/src/stdafx.h
+++ b/plugins/SendScreenshotPlus/src/stdafx.h
@@ -116,13 +116,11 @@ typedef struct _MGLOBAL {
 #define ERROR_TITLE		TranslateT("SendScreenshot - Error")
 
 // Miranda Database Key
-#define SZ_SENDSS		"SendSS"
+#define MODULENAME		"SendSS"
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(SZ_SENDSS)
-	{}
+	CMPlugin();
 };
 
 extern ATOM g_clsTargetHighlighter;