PLUGIN<> to half-automatically calculate the dll's g_hInstance and pass it inside

7 files changed, 53 insertions, 60 deletions

diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp
index b56ba33794..978e938e0a 100644
--- a/plugins/WebView/src/main.cpp
+++ b/plugins/WebView/src/main.cpp
@@ -74,13 +74,6 @@ void ChangeContactStatus(int con_stat)
 }

 

 /*****************************************************************************/

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

-{

-   hInst = hinstDLL;

-   return TRUE;

-}

-

-/*****************************************************************************/

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

 

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

@@ -128,7 +121,7 @@ extern "C" int __declspec(dllexport) Load()
 

 	HookEvent(ME_CLIST_DOUBLECLICKED, Doubleclick);

    

-	hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_CONTEXT));

+	hMenu = LoadMenu(g_hInstance, MAKEINTRESOURCE(IDR_CONTEXT));

 	hRichEd = LoadLibrary(L"Msftedit.dll");

 

 	/*TIMERS*/

@@ -171,7 +164,7 @@ extern "C" int __declspec(dllexport) Load()
 		/*DISABLE WEBVIEW*/

 		SET_UID(mi, 0xdedeb697, 0xfc10, 0x4622, 0x8b, 0x97, 0x74, 0x39, 0x32, 0x68, 0xa7, 0x7b);

 		CreateServiceFunction("DisableWebview", AutoUpdateMCmd);

-		mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

+		mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SITE));

 		if (db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0))

 			mi.name.w = LPGENW("Auto update disabled");

 		else

@@ -183,7 +176,7 @@ extern "C" int __declspec(dllexport) Load()
 		SET_UID(mi, 0xf324ede, 0xfdf, 0x498a, 0x8f, 0x49, 0x6d, 0x2a, 0x9f, 0xda, 0x58, 0x6);

 		CreateServiceFunction("UpdateAll", UpdateAllMenuCommand);

 		mi.position = 500090002;

-		mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_UPDATEALL));

+		mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_UPDATEALL));

 		mi.name.w = LPGENW("Update all Webview sites");

 		mi.pszService = "UpdateAll";

 		Menu_AddMainMenuItem(&mi);

@@ -192,7 +185,7 @@ extern "C" int __declspec(dllexport) Load()
 		SET_UID(mi, 0x1fa5fa21, 0x2ee1, 0x4372, 0xae, 0x3e, 0x3b, 0x96, 0xac, 0xd, 0xe8, 0x49);

 		CreateServiceFunction("MarkAllSitesRead", MarkAllReadMenuCommand);

 		mi.position = 500090099;

-		mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_MARKALLREAD));

+		mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MARKALLREAD));

 		mi.name.w = LPGENW("Mark all Webview sites as read");

 		mi.pszService = "MarkAllSitesRead";

 		Menu_AddMainMenuItem(&mi);

@@ -201,7 +194,7 @@ extern "C" int __declspec(dllexport) Load()
 		SET_UID(mi, 0xfed046a8, 0xaae5, 0x4cbe, 0xa8, 0xc, 0x3c, 0x50, 0x3e, 0x3e, 0x9b, 0x15);

 		CreateServiceFunction("OpenCacheFolder", OpenCacheDir);

 		mi.position = 500090099;

-		mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_FOLDER));

+		mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_FOLDER));

 		mi.name.w = LPGENW("Open cache folder");

 		mi.pszService = "OpenCacheFolder";

 		Menu_AddMainMenuItem(&mi);

@@ -213,7 +206,7 @@ extern "C" int __declspec(dllexport) Load()
 		wchar_t countername[100];

 		mir_snwprintf(countername, TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

 		mi.position = 600090099;

-		mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_UPDATEALL));

+		mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_UPDATEALL));

 		mi.name.w = countername;

 		mi.pszService = "Countdown";

 		hMenuItemCountdown = Menu_AddMainMenuItem(&mi);

@@ -225,7 +218,7 @@ extern "C" int __declspec(dllexport) Load()
 	SET_UID(mi, 0xadc6a9a4, 0xdf7, 0x4f63, 0x89, 0x11, 0x8e, 0x42, 0x1d, 0xd6, 0x29, 0x31);

 	CreateServiceFunction("Open web page", WebsiteMenuCommand);

 	mi.position = 100;

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_URL));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_URL));

 	mi.pszService = "Open web page";

 	mi.name.w = LPGENW("Open web page");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

@@ -233,42 +226,42 @@ extern "C" int __declspec(dllexport) Load()
 	SET_UID(mi, 0x9d803e61, 0xc929, 0x4c6e, 0x9e, 0x7, 0x93, 0x0, 0xab, 0x14, 0x13, 0x50);

 	CreateServiceFunction("OpenClose Window", DataWndMenuCommand);

 	mi.pszService = "OpenClose Window";

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SHOW_HIDE));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SHOW_HIDE));

 	mi.name.w = LPGENW("Open/Close window");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

 

 	SET_UID(mi, 0x3840cc71, 0xcc85, 0x448d, 0xb5, 0xc8, 0x1a, 0x7d, 0xfe, 0xf0, 0x8, 0x85);

 	mi.position = 2222220;

 	mi.pszService = "UpdateData";

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_UPDATE));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_UPDATE));

 	mi.name.w = LPGENW("Update data");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

 

 	SET_UID(mi, 0xd1ab586c, 0x2c71, 0x429c, 0xb1, 0x79, 0x7b, 0x3a, 0x1d, 0x4a, 0xc1, 0x7d);

 	CreateServiceFunction("ContactOptions", CntOptionsMenuCommand);

 	mi.pszService = "ContactOptions";

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_OPTIONS));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_OPTIONS));

 	mi.name.w = LPGENW("Contact options");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

 

 	SET_UID(mi, 0xe4cda597, 0x9def, 0x4f54, 0x8a, 0xc6, 0x69, 0x3b, 0x5a, 0x7d, 0x77, 0xb6);

 	CreateServiceFunction("ContactAlertOpts", CntAlertMenuCommand);

 	mi.pszService = "ContactAlertOpts";

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ALERT));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_ALERT));

 	mi.name.w = LPGENW("Contact alert options");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

 

 	SET_UID(mi, 0x63fdeed8, 0xf880, 0x423f, 0x95, 0xae, 0x20, 0x8c, 0x86, 0x3c, 0x5, 0xd8);

 	CreateServiceFunction("PingWebsite", PingWebsiteMenuCommand);

 	mi.pszService = "PingWebsite";

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_PING));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_PING));

 	mi.name.w = LPGENW("Ping web site");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

 

 	SET_UID(mi, 0x28fd36de, 0x6ce1, 0x43d0, 0xa1, 0x6e, 0x98, 0x71, 0x53, 0xe8, 0xc9, 0xf4);

 	CreateServiceFunction("StopDataProcessing", StpPrcssMenuCommand);

 	mi.pszService = "StopDataProcessing";

-	mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_STOP));

+	mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_STOP));

 	mi.name.w = LPGENW("Stop data processing");

 	Menu_AddContactMenuItem(&mi, MODULENAME);

 

@@ -284,13 +277,15 @@ extern "C" int __declspec(dllexport) Load()
 

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

 

-struct CMPlugin : public CMPluginBase

+struct CMPlugin : public PLUGIN<CMPlugin>

 {

 	CMPlugin() :

-		CMPluginBase(MODULENAME)

+		PLUGIN<CMPlugin>(MODULENAME)

 	{

 		RegisterProtocol(PROTOTYPE_PROTOCOL);

 		SetUniqueId("PreserveName");

 	}

 }

 	g_plugin;

+

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

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index bd83ccab8b..be2b8635bc 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -38,7 +38,7 @@ UINT_PTR  Countdown;
 LOGFONT   g_lf;

 HFONT     h_font;

 HWND      ContactHwnd;

-HINSTANCE hInst;

+HINSTANCE g_hInstance;

 HMENU     hMenu;

 int       bpStatus;

 HGENMENU  hMenuItem1;

@@ -54,14 +54,14 @@ void ChangeMenuItem1()
 	else

 		ptszName = LPGENW("Auto update disabled");

 

-	Menu_ModifyItem(hMenuItem1, ptszName, LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE)));

+	Menu_ModifyItem(hMenuItem1, ptszName, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SITE)));

 }

 

 /*****************************************************************************/

 void ChangeMenuItemCountdown()

 {

 	// countdown

-	HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_UPDATEALL));

+	HICON hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_UPDATEALL));

 

 	wchar_t countername[100];

 	mir_snwprintf(countername, TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

@@ -185,9 +185,9 @@ int Doubleclick(WPARAM wParam, LPARAM)
 			SetFocus(hwndDlg);

 		}

 		else {

-			hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, (LPARAM)hContact);

+			hwndDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, (LPARAM)hContact);

 			HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

-			SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)((HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

+			SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)((HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

 

 			if (db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

 				SetWindowPos(hwndDlg, hTopmost,

@@ -293,7 +293,7 @@ void CALLBACK Countdownfunc(HWND, UINT, UINT_PTR, DWORD)
 static int OptInitialise(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInstance;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);

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

 	odp.szTitle.a = MODULENAME;

@@ -368,8 +368,8 @@ INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM)
 	}

 

 	HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

-	hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, (LPARAM)hContact);

-	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+	hwndDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, (LPARAM)hContact);

+	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 	if (db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

 		SetWindowPos(hwndDlg, hTopmost,

 			db_get_dw(hContact, MODULENAME, "WVx", 100), // Xposition,

@@ -474,7 +474,7 @@ INT_PTR CntOptionsMenuCommand(WPARAM wParam, LPARAM)
 		return 0;

 	}

 

-	hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONTACT_OPT), nullptr, DlgProcContactOpt, (LPARAM)wParam);

+	hwndDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_CONTACT_OPT), nullptr, DlgProcContactOpt, (LPARAM)wParam);

 	ShowWindow(hwndDlg, SW_SHOW);

 	SetActiveWindow(hwndDlg);

 	return 0;

@@ -489,7 +489,7 @@ INT_PTR CntAlertMenuCommand(WPARAM wParam, LPARAM)
 		return 0;

 	}

 

-	hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ALRT_OPT), nullptr, DlgProcAlertOpt, (LPARAM)wParam);

+	hwndDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_ALRT_OPT), nullptr, DlgProcAlertOpt, (LPARAM)wParam);

 	ShowWindow(hwndDlg, SW_SHOW);

 	SetActiveWindow(hwndDlg);

 	return 0;

diff --git a/plugins/WebView/src/webview.h b/plugins/WebView/src/webview.h
index b144ade234..c9bfd998a4 100644
--- a/plugins/WebView/src/webview.h
+++ b/plugins/WebView/src/webview.h
@@ -143,7 +143,6 @@ extern UINT_PTR timerId, Countdown;
 extern LOGFONT g_lf;

 extern HFONT h_font;

 extern HWND ContactHwnd;

-extern HINSTANCE hInst;

 extern HMENU hMenu;

 extern int bpStatus;

 extern HNETLIBUSER hNetlibUser;

@@ -157,7 +156,6 @@ void CALLBACK Countdownfunc(HWND, UINT, UINT_PTR, DWORD);
 void SavewinSettings(void);

 void ValidatePosition(HWND hwndDlg);

 int  ModulesLoaded(WPARAM wParam, LPARAM lParam);

-void ChangeMenuItem3();

 wchar_t* FixButtonText(wchar_t *url, size_t len);

 int  ContactMenuItemUpdateData (WPARAM wParam, LPARAM lParam);

 

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index d3dc4fc415..a21b19f693 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -122,7 +122,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 	else mir_wstrcpy(ppd.lptzContactName, _A2W(MODULENAME));

 

 	ppd.lchContact = wParam;

-	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

+	ppd.lchIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SITE));

 

 	wchar_t *displaytext = (wchar_t*)lParam;

 	if ((mir_wstrlen(displaytext) == MAX_SECONDLINE) ||  (mir_wstrlen(displaytext) > MAX_SECONDLINE))

@@ -413,7 +413,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 		else if (eventIndex == 1) { // webpage changed

 			// TEST GET NAME FOR CACHE

 			wchar_t cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];

-			GetModuleFileName(hInst, cachepath, _countof(cachepath));

+			GetModuleFileName(g_hInstance, cachepath, _countof(cachepath));

 			wchar_t *cacheend = wcsrchr(cachepath, '\\');

 			cacheend++;

 			*cacheend = '\0';

@@ -625,7 +625,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 			if (((strstr(tempraw, Alerttempstring)) != nullptr) && ((strstr(tempraw, Alerttempstring2)) != nullptr)) {

 				// TEST GET NAME FOR CACHE

 				wchar_t cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];

-				GetModuleFileName(hInst, cachepath, _countof(cachepath));

+				GetModuleFileName(g_hInstance, cachepath, _countof(cachepath));

 				wchar_t *cacheend = wcsrchr(cachepath, '\\');

 				cacheend++;

 				*cacheend = '\0';

@@ -763,9 +763,9 @@ int DataWndAlertCommand(WPARAM wParam, LPARAM)
 	if ( WindowList_Find(hWindowList, hContact))

 		return 0;

 

-	HWND hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, hContact);

+	HWND hwndDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, hContact);

 	HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

-	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) ((HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

+	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) ((HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

 	if ( db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

 		SetWindowPos(hwndDlg, hTopmost,

 			db_get_dw(hContact, MODULENAME, "WVx", 100), // Xposition,

diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp
index 2bd17e4863..425b43e7ae 100644
--- a/plugins/WebView/src/webview_datawnd.cpp
+++ b/plugins/WebView/src/webview_datawnd.cpp
@@ -39,7 +39,7 @@ INT_PTR CALLBACK DlgProcFind(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		TranslateDialogDefault(hwndDlg);

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		SetWindowText(hwndDlg, TranslateT("Find"));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(hInst, MAKEINTRESOURCE(IDI_FIND)));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_FIND)));

 		return TRUE;

 

 	case WM_COMMAND:

@@ -175,36 +175,36 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			else preservename[0] = 0;

 			SetWindowTextA(hwndDlg, preservename);

 

-			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE)));

+			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SITE)));

 

 			// //////

 			COLORREF colour = BackgoundClr;

 			COLORREF txtcolor;

 			SendDlgItemMessage(hwndDlg, IDC_DATA, EM_SETBKGNDCOLOR, 0, colour);

 

-			SendDlgItemMessage(hwndDlg, IDC_UPDATE_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_UPDATE), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+			SendDlgItemMessage(hwndDlg, IDC_UPDATE_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_UPDATE), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 			SendDlgItemMessage(hwndDlg, IDC_UPDATE_BUTTON, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Update data"), BATF_UNICODE);

 

-			SendDlgItemMessage(hwndDlg, IDC_FIND_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_FIND), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+			SendDlgItemMessage(hwndDlg, IDC_FIND_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_FIND), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 			SendDlgItemMessage(hwndDlg, IDC_FIND_BUTTON, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Find"), BATF_UNICODE);

 

-			SendDlgItemMessage(hwndDlg, IDC_OPTIONS_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_OPTIONS), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+			SendDlgItemMessage(hwndDlg, IDC_OPTIONS_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_OPTIONS), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 			SendDlgItemMessage(hwndDlg, IDC_OPTIONS_BUTTON, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Contact options"), BATF_UNICODE);

 

-			SendDlgItemMessage(hwndDlg, IDC_ALERT_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_ALERT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+			SendDlgItemMessage(hwndDlg, IDC_ALERT_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_ALERT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 			SendDlgItemMessage(hwndDlg, IDC_ALERT_BUTTON, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Alert options"), BATF_UNICODE);

 

-			SendDlgItemMessage(hwndDlg, IDC_STOP, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_STOP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+			SendDlgItemMessage(hwndDlg, IDC_STOP, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_STOP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 			SendDlgItemMessage(hwndDlg, IDC_STOP, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Stop processing"), BATF_UNICODE);

 

 			SendDlgItemMessage(hwndDlg, IDC_OPEN_URL, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Click here to open this URL in a browser window."), BATF_UNICODE);

 

 			if (!db_get_b(hContact2, MODULENAME, ON_TOP_KEY, 0)) {

-				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_UNSTICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_UNSTICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Stick to the front"), BATF_UNICODE);

 			}

 			else {

-				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(hInst, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BUTTONADDTOOLTIP, (WPARAM) TranslateT("Disable stick to the front"), BATF_UNICODE);

 			}

 

@@ -368,7 +368,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					hTopmost = HWND_TOPMOST;

 					ptszToolTip = TranslateT("Disable stick to the front");

 				}

-				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_UNSTICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

+				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_UNSTICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

 				SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BUTTONADDTOOLTIP, (WPARAM)ptszToolTip, BATF_UNICODE);

 				SetWindowPos(hwndDlg, hTopmost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);

 			}

@@ -376,7 +376,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 		case IDC_FIND_BUTTON:

 			{

-				HWND hwndFind = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FIND), hwndDlg, DlgProcFind, (LPARAM) wParam);

+				HWND hwndFind = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_FIND), hwndDlg, DlgProcFind, (LPARAM) wParam);

 				ShowWindow(hwndFind, SW_SHOW);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_FIND_BUTTON), 0);

 			}

@@ -384,7 +384,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 		case IDC_OPTIONS_BUTTON:

 			if (hContact = FindContactByUrl(hwndDlg)) {

-				ContactHwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONTACT_OPT), hwndDlg, DlgProcContactOpt, (LPARAM) hContact);

+				ContactHwnd = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_CONTACT_OPT), hwndDlg, DlgProcContactOpt, (LPARAM) hContact);

 				ShowWindow(ContactHwnd, SW_SHOW);

 				SetActiveWindow(ContactHwnd);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_OPTIONS_BUTTON), 0);

@@ -394,7 +394,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 		case IDC_ALERT_BUTTON:

 			if (hContact = FindContactByUrl(hwndDlg)) {

-				HWND hwndAlertOpt = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ALRT_OPT), hwndDlg, DlgProcAlertOpt, (LPARAM) hContact);

+				HWND hwndAlertOpt = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_ALRT_OPT), hwndDlg, DlgProcAlertOpt, (LPARAM) hContact);

 				ShowWindow(hwndAlertOpt, SW_SHOW);

 				SetActiveWindow(hwndAlertOpt);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ALERT_BUTTON), 0);

@@ -431,7 +431,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		return 0;

 

 	case WM_SIZE:

-		Utils_ResizeDialog(hwndDlg, hInst, MAKEINTRESOURCEA(IDD_DISPLAY_DATA), DataDialogResize);

+		Utils_ResizeDialog(hwndDlg, g_hInstance, MAKEINTRESOURCEA(IDD_DISPLAY_DATA), DataDialogResize);

 		InvalidateRect(hwndDlg, nullptr, TRUE);

 

 		// global

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index 4ad9519b4a..348185a01d 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -207,7 +207,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				}

 				ppd.lchContact = NULL;

 				mir_wstrcpy(ppd.lptzContactName, _A2W(MODULENAME));

-				ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

+				ppd.lchIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SITE));

 				mir_wstrcpy(ppd.lptzText, TranslateT("This is a preview popup."));

 				ppd.colorBack = BGColour;

 				ppd.colorText = TextColour;

@@ -279,7 +279,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 		SetWindowText(hwndDlg, TranslateT("Alert options"));

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_ALERT)));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_ALERT)));

 

 		EnableWindow(GetDlgItem(hwndDlg, IDC_ALERT_APPLY), 0);

 

@@ -819,7 +819,7 @@ INT_PTR CALLBACK DlgProcContactOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 		SetWindowText(hwndDlg, TranslateT("Contact options"));

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_OPTIONS)));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_OPTIONS)));

 

 		EnableWindow(GetDlgItem(hwndDlg, IDC_OPT_APPLY), 0);

 

diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp
index 3d0f27c556..277683ea74 100644
--- a/plugins/WebView/src/webview_services.cpp
+++ b/plugins/WebView/src/webview_services.cpp
@@ -80,7 +80,7 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam)
 
 			// TEST GET NAME FOR CACHE
 			wchar_t cachepath[MAX_PATH], cachedirectorypath[MAX_PATH];
-			GetModuleFileName(hInst, cachepath, _countof(cachepath));
+			GetModuleFileName(g_hInstance, cachepath, _countof(cachepath));
 			wchar_t *cacheend = wcsrchr(cachepath, '\\');
 			cacheend++;
 			*cacheend = '\0';
@@ -118,7 +118,7 @@ int SiteDeleted(WPARAM wParam, LPARAM)
 
 	// TEST GET NAME FOR CACHE
 	wchar_t cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];
-	GetModuleFileName(hInst, cachepath, _countof(cachepath));
+	GetModuleFileName(g_hInstance, cachepath, _countof(cachepath));
 	wchar_t *cacheend = wcsrchr(cachepath, '\\');
 	cacheend++;
 	*cacheend = '\0';
@@ -143,7 +143,7 @@ INT_PTR OpenCacheDir(WPARAM, LPARAM)
 {
 	//GET NAME FOR CACHE
 	wchar_t cachepath[MAX_PATH], cachedirectorypath[MAX_PATH];
-	GetModuleFileName(hInst, cachepath, _countof(cachepath));
+	GetModuleFileName(g_hInstance, cachepath, _countof(cachepath));
 	wchar_t *cacheend = wcsrchr(cachepath, '\\');
 	cacheend++;
 	*cacheend = '\0';
@@ -292,7 +292,7 @@ INT_PTR BPLoadIcon(WPARAM wParam, LPARAM)
 	default:
 		return 0;
 	}
-	return (INT_PTR)LoadImage(hInst, MAKEINTRESOURCE(id), IMAGE_ICON,
+	return (INT_PTR)LoadImage(g_hInstance, MAKEINTRESOURCE(id), IMAGE_ICON,
 		GetSystemMetrics(wParam & PLIF_SMALL ? SM_CXSMICON : SM_CXICON),
 		GetSystemMetrics(wParam & PLIF_SMALL ? SM_CYSMICON : SM_CYICON), 0);
 }