g_hInstance incapulated into PLUGIN<>, no need in the separate variable

4 files changed, 13 insertions, 14 deletions

diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp
index de7559e55e..94dd556b24 100644
--- a/protocols/Twitter/src/main.cpp
+++ b/protocols/Twitter/src/main.cpp
@@ -22,10 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "proto.h"

 #include "theme.h"

 

-CMPlugin g_plugin;

-CLIST_INTERFACE* pcli;

+CLIST_INTERFACE *pcli;

 

-HINSTANCE g_hInstance;

 int hLangpack = 0;

 

 PLUGININFOEX pluginInfo = {

@@ -41,15 +39,18 @@ PLUGININFOEX pluginInfo = {
 	{ 0xbc09a71b, 0xb86e, 0x4d33, { 0xb1, 0x8d, 0x82, 0xd3, 0x4, 0x51, 0xdd, 0x3c } }

 };

 

-extern "C" _pfnCrtInit _pRawDllMain = &CMPlugin::RawDllMain;

-

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

 {

 	return &pluginInfo;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

-// Interface information

+

+CMPlugin g_plugin;

+

+extern "C" _pfnCrtInit _pRawDllMain = &CMPlugin::RawDllMain;

+

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

 

 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };

 

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index f25e7d86df..b57cf5d452 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -191,14 +191,14 @@ int TwitterProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
 

 INT_PTR TwitterProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)

 {

-	return (INT_PTR)CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_TWITTERACCOUNT), (HWND)lParam, first_run_dialog, (LPARAM)this);

+	return (INT_PTR)CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_TWITTERACCOUNT), (HWND)lParam, first_run_dialog, (LPARAM)this);

 }

 

 INT_PTR TwitterProto::ReplyToTweet(WPARAM wParam, LPARAM)

 {

 	MCONTACT hContact = (MCONTACT) wParam;

 	// TODO: support replying to tweets instead of just users

-	HWND hDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_TWEET), nullptr, tweet_proc, reinterpret_cast<LPARAM>(this));

+	HWND hDlg = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_TWEET), nullptr, tweet_proc, reinterpret_cast<LPARAM>(this));

 

 	DBVARIANT dbv;

 	if (!getString(hContact, TWITTER_KEY_UN, &dbv)) {

@@ -252,7 +252,7 @@ int TwitterProto::OnOptionsInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 271828;

-	odp.hInstance = g_hInstance;

+	odp.hInstance = g_plugin.getInst();

 	odp.szGroup.w = LPGENW("Network");

 	odp.szTitle.w = m_tszUserName;

 	odp.dwInitParam = LPARAM(this);

@@ -277,7 +277,7 @@ INT_PTR TwitterProto::OnTweet(WPARAM, LPARAM)
 	if (m_iStatus != ID_STATUS_ONLINE)

 		return 1;

 

-	HWND hDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_TWEET), nullptr, tweet_proc, reinterpret_cast<LPARAM>(this));

+	HWND hDlg = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_TWEET), nullptr, tweet_proc, reinterpret_cast<LPARAM>(this));

 	ShowWindow(hDlg, SW_SHOW);

 	return 0;

 }

@@ -343,7 +343,7 @@ int TwitterProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 

 int TwitterProto::ShowPinDialog()

 {

-	HWND hDlg = (HWND)DialogBoxParam(g_hInstance, MAKEINTRESOURCE(IDD_TWITTERPIN), nullptr, pin_proc, reinterpret_cast<LPARAM>(this));

+	HWND hDlg = (HWND)DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_TWITTERPIN), nullptr, pin_proc, reinterpret_cast<LPARAM>(this));

 	ShowWindow(hDlg, SW_SHOW);

 	return 0;

 }

diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h
index 1183be966a..eaae38768d 100644
--- a/protocols/Twitter/src/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
@@ -65,8 +65,6 @@ typedef std::basic_string<wchar_t> wstring;
 

 #include "StringUtil.h"

 

-extern HINSTANCE g_hInstance;

-

 #define TWITTER_KEY_NICK		   "Nick"  // we need one called Nick for the chat thingo to work

 #define TWITTER_KEY_UN             "Username"

 #define TWITTER_KEY_PASS           "Password"

diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index 75c5252f34..e3b967caf3 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -38,7 +38,7 @@ void TwitterInitSounds(void)
 // TODO: uninit

 void InitIcons(void)

 {

-	Icon_Register(g_hInstance, "Protocols/Twitter", icons, _countof(icons), "Twitter");

+	Icon_Register(g_plugin.getInst(), "Protocols/Twitter", icons, _countof(icons), "Twitter");

 	icons[_countof(icons) - 1].hIcolib = Skin_GetIconHandle(SKINICON_EVENT_URL);

 }