fixes for StatusIconData initialization

git-svn-id: http://svn.miranda-ng.org/main/trunk@5863 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 21 insertions, 31 deletions

diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 2350138fdd..0081078862 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -532,12 +532,10 @@ static BOOL sttDrawItem_Group(LPDRAWITEMSTRUCT lpdis, Options *options = NULL)
 	if (options->bSysColors)

 	{

 		FillRect(lpdis->hDC, &lpdis->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT));

-		//FrameRect(lpdis->hDC, &lpdis->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT));

 		SetTextColor(lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));

-	} else

-	{

-		HBRUSH hbr;

-		hbr = CreateSolidBrush(g_Options.clBackSel);

+	}

+	else {

+		HBRUSH hbr = CreateSolidBrush(g_Options.clBackSel);

 		FillRect(lpdis->hDC, &lpdis->rcItem, hbr);

 		DeleteObject(hbr);

 		//hbr = CreateSolidBrush(g_Options.clBackSel);

@@ -998,8 +996,7 @@ int ProcessSrmmEvent( WPARAM wParam, LPARAM lParam )
 		WindowList_Add(hDialogsList, event->hwndWindow, event->hContact);

 

 		BYTE fav = db_get_b(event->hContact, "FavContacts", "IsFavourite", 0);

-		StatusIconData sid = {0};

-		sid.cbSize = sizeof(sid);

+		StatusIconData sid = { sizeof(sid) };

 		sid.szModule = "FavContacts";

 		sid.flags = fav ? 0 : MBF_DISABLED;

 		Srmm_ModifyIcon(event->hContact, &sid);

diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index 75f8d65143..3f3bfa84a1 100644
--- a/plugins/HistorySweeperLight/src/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
@@ -53,9 +53,9 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam)
 	if ( !(sicd->flags & MBCF_RIGHTBUTTON) && !lstrcmpA(sicd->szModule, ModuleName) 

 		&& db_get_b(NULL, ModuleName, "ChangeInMW", 0))

 	{

-		int nh = sicd->dwId; HANDLE hContact = (HANDLE)wParam; StatusIconData sid = {0};

-

-		sid.cbSize = sizeof(sid);

+		int nh = sicd->dwId; HANDLE hContact = (HANDLE)wParam; 

+		

+		StatusIconData sid = { sizeof(sid) };

 		sid.szModule = ModuleName;

 		sid.dwId = nh;

 		sid.flags = MBF_HIDDEN;

@@ -74,10 +74,9 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam)
 

 int OnModulesLoaded(WPARAM wParam, LPARAM lParam) 

 {

-	StatusIconData sid = {0};

 	int i, sweep = db_get_b(NULL, ModuleName, "SweepHistory", 0);

 

-	sid.cbSize = sizeof(sid);

+	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = ModuleName;

 

 	sid.hIcon = LoadIconEx("actG");

diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp
index 436fecd86f..d2b2a329f7 100644
--- a/plugins/HistorySweeperLight/src/options.cpp
+++ b/plugins/HistorySweeperLight/src/options.cpp
@@ -157,7 +157,7 @@ void LoadSettings(HWND hwndDlg)
 

 void SaveSettings(HWND hwndDlg)

 {

-	int st, i; StatusIconData sid = {0};

+	int st, i;

 	HWND hwndList = GetDlgItem(hwndDlg, IDC_LIST);

 

 	db_set_b(NULL, ModuleName, "StartupShutdownOlder", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_GETCURSEL, 0, 0));

@@ -166,7 +166,7 @@ void SaveSettings(HWND hwndDlg)
 	db_set_b(NULL, ModuleName, "SweepOnClose", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SWEEPONCLOSE));

 	db_set_b(NULL, ModuleName, "ChangeInMW", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HISTMW));

 

-	sid.cbSize = sizeof(sid);

+	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = ModuleName;

 

 	db_set_b(NULL, ModuleName, "SweepHistory",

diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp
index 1e676bca57..22c6dde6e6 100644
--- a/plugins/NoHistory/src/dllmain.cpp
+++ b/plugins/NoHistory/src/dllmain.cpp
@@ -176,8 +176,7 @@ INT_PTR ServiceToggle(WPARAM wParam, LPARAM lParam)
 	remove = !remove;

 	db_set_b(hContact, MODULE, DBSETTING_REMOVE, remove != 0);

 

-	StatusIconData sid = {0};

-	sid.cbSize = sizeof(sid);

+	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = MODULE;

 

 	for (int i = 0; i < 2; ++i) {

diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index ed6e3a2952..28e6da3f8a 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -71,8 +71,7 @@ static void SrmmMenu_UpdateIcon(HANDLE hContact)
 

 	int mode = db_get_b(hContact, MODULNAME, "ShowMode", PU_SHOWMODE_AUTO);

 

-	StatusIconData sid = {0};

-	sid.cbSize = sizeof(sid);

+	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = MODULNAME;

 

 	for (int i=0; i < 4; ++i) {

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 06124f4f3a..fd6aa4bb05 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1253,8 +1253,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 	case DM_SWITCHTYPING:

 		if (IsTypingNotificationSupported(dat)) {

-			StatusIconData sid = {0};

-			sid.cbSize = sizeof(sid);

+			StatusIconData sid = { sizeof(sid) };

 			sid.szModule = SRMMMOD;

 			sid.dwId = 1;

 

@@ -1470,7 +1469,6 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		if (dat->parent->hwndActive == hwndDlg) {

 			TCHAR szText[256];

 			StatusBarData sbd= {0};

-			StatusIconData sid = {0};

 			sbd.iFlags = SBDF_TEXT | SBDF_ICON;

 			if (dat->messagesInProgress && (g_dat.flags & SMF_SHOWPROGRESS)) {

 				sbd.hIcon = GetCachedIcon("scriver_DELIVERING");

@@ -1496,7 +1494,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 			SendMessage(dat->hwndParent, CM_UPDATESTATUSBAR, (WPARAM)&sbd, (LPARAM)hwndDlg);

 			UpdateReadChars(hwndDlg, dat);

-			sid.cbSize = sizeof(sid);

+

+			StatusIconData sid = { sizeof(sid) };

 			sid.szModule = SRMMMOD;

 			sid.flags = MBF_DISABLED;

 			Srmm_ModifyIcon(dat->windowData.hContact, &sid);

diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp
index 720120059e..ab421e843b 100644
--- a/plugins/SecureIM/src/crypt_icons.cpp
+++ b/plugins/SecureIM/src/crypt_icons.cpp
@@ -79,7 +79,7 @@ void ShowStatusIcon(HANDLE hContact, int mode)
 			ExtraIcon_Clear(g_hCLIcon, hMC);

 	}

 

-	StatusIconData sid = {sizeof(sid) };

+	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = (char*)MODULENAME;

 	for (int i = MODE_NATIVE; i < MODE_CNT; i++) {

 		sid.dwId = i;

diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 13f4a007de..da66562cf0 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -399,15 +399,12 @@ static __inline int MessageAPI_AddIcon(const char* pszName, const char* szModul/
 {

 	HICON hIcon = Skin_GetIcon(pszName);

 

-	StatusIconData sid		= {0};

-	sid.cbSize				= sizeof(sid);

-	sid.szModule			= (char*)szModul;

-	sid.dwId				= (DWORD)ID;

-	sid.hIcon				= (hIcon!=NULL)?CopyIcon(hIcon):NULL;

+	StatusIconData sid = { sizeof(sid) };

+	sid.szModule = (char*)szModul;

+	sid.dwId = (DWORD)ID;

+	sid.hIcon = (hIcon!=NULL)?CopyIcon(hIcon):NULL;

+	sid.szTooltip = Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,ID,0));

 	Skin_ReleaseIcon(hIcon); /* does NULL check */

-//	sid.hIconDisabled		= sid.hIcon/*NULL*/;

-	sid.flags				= 0;

-	sid.szTooltip			= Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,ID,0));

 

 	int res = -1;

 	IconList* p = new IconList(&sid);