Popup, PManagerEx, QuickContacts, RemovePersonalSettings, Restart, SeenPlugin, SendSS, ShlExt, SimpleAR, SimpleStatusMsg, SkypeStatusChange, SmileyAdd, SMS => CMPlugin

3 files changed, 36 insertions, 37 deletions

diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp
index 5bd5d69fa5..94fd2c560a 100644
--- a/plugins/SkypeStatusChange/src/main.cpp
+++ b/plugins/SkypeStatusChange/src/main.cpp
@@ -5,10 +5,22 @@
 #pragma comment(lib, "Comctl32.lib")

 

 int hLangpack = 0;

+CMPlugin g_plugin;

 

 int SSC_OptInitialise(WPARAM wp, LPARAM lp);

 

-PLUGININFOEX g_pluginInfo =

+UINT g_MsgIDSkypeControlAPIAttach = 0;

+UINT g_MsgIDSkypeControlAPIDiscover = 0;

+HWND g_wndMainWindow = nullptr;

+

+bool g_bMirandaIsShutdown = false;

+

+HANDLE g_hThread = nullptr;

+HANDLE g_hEventShutdown = nullptr;

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+static PLUGININFOEX g_pluginInfo =

 {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

@@ -17,20 +29,16 @@ PLUGININFOEX g_pluginInfo =
 	__AUTHOR,

 	__COPYRIGHT,

 	__AUTHORWEB,

-	UNICODE_AWARE,		//not transient

-	{ 0x2925520b, 0x6677, 0x4658, { 0x8b, 0xad, 0x56, 0x61, 0xd1, 0x3e, 0x46, 0x92 } }

+	UNICODE_AWARE,

+	{ 0x2925520b, 0x6677, 0x4658, { 0x8b, 0xad, 0x56, 0x61, 0xd1, 0x3e, 0x46, 0x92 }}

 };

 

-HINSTANCE g_hModule = nullptr;

-

-UINT   g_MsgIDSkypeControlAPIAttach = 0;

-UINT   g_MsgIDSkypeControlAPIDiscover = 0;

-HWND   g_wndMainWindow = nullptr;

-

-HANDLE g_hThread = nullptr;

-HANDLE g_hEventShutdown = nullptr;

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

+{

+	return &g_pluginInfo;

+}

 

-bool   g_bMirandaIsShutdown = false;

+/////////////////////////////////////////////////////////////////////////////////////////

 

 enum

 {

@@ -84,8 +92,8 @@ private:
 	size_t m_nStatusIndex;

 };

 

-COptions         g_Options;

-CStatusInfo      g_CurrStatusInfo;

+COptions g_Options;

+CStatusInfo g_CurrStatusInfo;

 mir_cs g_csStatusInfo;

 

 int SSC_OnProtocolAck(WPARAM, LPARAM lParam)

@@ -253,25 +261,12 @@ int SSC_OnPreShutdown(WPARAM/* wParam*/, LPARAM/* lParam*/)
 		g_wndMainWindow = nullptr;

 	}

 

-	UnregisterClass(g_pszSkypeWndClassName, g_hModule);

+	UnregisterClass(g_pszSkypeWndClassName, g_plugin.getInst());

 	return 0;

 }

 

 /******************************* INSTALLATION PROCEDURES *****************************/

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID)

-{

-	if (fdwReason == DLL_PROCESS_ATTACH)

-		g_hModule = hinstDLL;

-

-	return TRUE;

-}

-

-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

-{

-	return &g_pluginInfo;

-}

-

 extern "C" int __declspec(dllexport) Load()

 {

 	mir_getLP(&g_pluginInfo);

@@ -284,14 +279,14 @@ extern "C" int __declspec(dllexport) Load()
 	WNDCLASS oWindowClass = { 0 };

 	oWindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;

 	oWindowClass.lpfnWndProc = (WNDPROC)&SkypeAPI_WindowProc;

-	oWindowClass.hInstance = g_hModule;

+	oWindowClass.hInstance = g_plugin.getInst();

 	oWindowClass.lpszClassName = g_pszSkypeWndClassName;

 	if (!RegisterClass(&oWindowClass))

 		return 1;

 

 	g_wndMainWindow = CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE,

 		g_pszSkypeWndClassName, L"", WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX,

-		CW_USEDEFAULT, CW_USEDEFAULT, 128, 128, nullptr, nullptr, g_hModule, nullptr);

+		CW_USEDEFAULT, CW_USEDEFAULT, 128, 128, nullptr, nullptr, g_plugin.getInst(), nullptr);

 	if (g_wndMainWindow == nullptr)

 		return 1;

 

@@ -306,6 +301,8 @@ extern "C" int __declspec(dllexport) Load()
 	return 0;

 }

 

+/////////////////////////////////////////////////////////////////////////////////////////

+

 extern "C" __declspec(dllexport) int Unload(void)		// Executed on DLL unload

 {

 	return 0;

diff --git a/plugins/SkypeStatusChange/src/options.cpp b/plugins/SkypeStatusChange/src/options.cpp
index b80d7abfb2..fc3e2dfab8 100644
--- a/plugins/SkypeStatusChange/src/options.cpp
+++ b/plugins/SkypeStatusChange/src/options.cpp
@@ -204,7 +204,7 @@ class CImageListWrapper
 {

 public:

 	CImageListWrapper()

-		: m_hImageList(ImageList_LoadImage(g_hModule,MAKEINTRESOURCE(IDB_TREE_STATE),16,0,RGB(255,255,255),IMAGE_BITMAP,LR_DEFAULTCOLOR))

+		: m_hImageList(ImageList_LoadImage(g_plugin.getInst(),MAKEINTRESOURCE(IDB_TREE_STATE),16,0,RGB(255,255,255),IMAGE_BITMAP,LR_DEFAULTCOLOR))

 	{

 	}

 

@@ -301,7 +301,7 @@ int SSC_OptInitialise(WPARAM wp, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 910000000;

-	odp.hInstance = g_hModule;

+	odp.hInstance = g_plugin.getInst();

 	odp.szTitle.a = LPGEN("Change Skype status");

 	odp.szGroup.a = LPGEN("Plugins");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_SETTINGS);

diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index efe7b97572..d143849cc9 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -5,7 +5,6 @@
 #include <assert.h>

 #include <commctrl.h>

 

-#define __NO_CMPLUGIN_NEEDED

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_protocols.h>

@@ -18,6 +17,13 @@
 

 #define MODULENAME "Change Skype Status"

 

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(MODULENAME)

+	{}

+};

+

 class COptions

 {

 	enum

@@ -163,7 +169,3 @@ struct CMirandaStatus2SkypeStatus
 };

 

 extern const CMirandaStatus2SkypeStatus g_aStatusCode[10];

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

-extern HINSTANCE g_hModule;
\ No newline at end of file