massive cleanup of useless cbSize fields

5 files changed, 9 insertions, 10 deletions

diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp
index 970d78429a..596828869b 100644
--- a/plugins/Scriver/src/chat_window.cpp
+++ b/plugins/Scriver/src/chat_window.cpp
@@ -536,7 +536,7 @@ void CChatRoomDlg::UpdateStatusBar()
 	sbd.pszText = L"";

 	SendMessage(m_hwndParent, CM_UPDATESTATUSBAR, (WPARAM)&sbd, (LPARAM)m_hwnd);

 

-	StatusIconData sid = { sizeof(sid) };

+	StatusIconData sid = {};

 	sid.szModule = SRMM_MODULE;

 	Srmm_ModifyIcon(m_hContact, &sid);

 }

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index b01c9cc288..36cd2601c6 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -151,7 +151,7 @@ static int ackevent(WPARAM, LPARAM lParam)
 	dbei.cbBlob = (int)mir_strlen(item->sendBuffer) + 1;

 	dbei.pBlob = (PBYTE)item->sendBuffer;

 

-	MessageWindowEvent evt = { sizeof(evt), item->hSendId, hContact, &dbei };

+	MessageWindowEvent evt = { item->hSendId, hContact, &dbei };

 	NotifyEventHooks(hHookWinWrite, 0, (LPARAM)&evt);

 

 	item->sendBuffer = (char *)dbei.pBlob;

diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp
index 3ba984c959..0698cdf2d9 100644
--- a/plugins/Scriver/src/input.cpp
+++ b/plugins/Scriver/src/input.cpp
@@ -65,7 +65,6 @@ void InputAreaContextMenu(HWND hwnd, WPARAM, LPARAM lParam, MCONTACT hContact)
 

 	// First notification

 	MessageWindowPopupData mwpd;

-	mwpd.cbSize = sizeof(mwpd);

 	mwpd.uType = MSG_WINDOWPOPUP_SHOWING;

 	mwpd.uFlags = MSG_WINDOWPOPUP_INPUT;

 	mwpd.hContact = hContact;

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index a798d00868..82ec8e9851 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -773,7 +773,7 @@ void CSrmmWindow::UpdateStatusBar()
 		SendMessage(m_hwndParent, CM_UPDATESTATUSBAR, (WPARAM)&sbd, (LPARAM)m_hwnd);

 		UpdateReadChars();

 

-		StatusIconData sid = { sizeof(sid) };

+		StatusIconData sid = {};

 		sid.szModule = SRMM_MODULE;

 		sid.flags = MBF_DISABLED;

 		Srmm_ModifyIcon(m_hContact, &sid);

@@ -1304,7 +1304,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 

 	case DM_SWITCHTYPING:

 		if (IsTypingNotificationSupported()) {

-			StatusIconData sid = { sizeof(sid) };

+			StatusIconData sid = {};

 			sid.szModule = SRMM_MODULE;

 			sid.dwId = 1;

 

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index b6478dc16b..30776f7aa5 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -286,11 +286,11 @@ static void RestoreUnreadMessageAlerts(void)
 static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam)

 {

 	MessageWindowInputData *mwid = (MessageWindowInputData*)wParam;

-	if (mwid == nullptr || mwid->cbSize != sizeof(MessageWindowInputData) || mwid->hContact == 0 || mwid->uFlags != MSG_WINDOW_UFLAG_MSG_BOTH)

+	if (mwid == nullptr || mwid->hContact == 0 || mwid->uFlags != MSG_WINDOW_UFLAG_MSG_BOTH)

 		return 1;

 

 	MessageWindowData *mwd = (MessageWindowData*)lParam;

-	if (mwd == nullptr || mwd->cbSize != sizeof(MessageWindowData))

+	if (mwd == nullptr)

 		return 1;

 

 	HWND hwnd = WindowList_Find(pci->hWindowList, mwid->hContact);

@@ -306,7 +306,7 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam)
 static INT_PTR SetStatusText(WPARAM hContact, LPARAM lParam)

 {

 	StatusTextData *st = (StatusTextData*)lParam;

-	if (st != nullptr && st->cbSize != sizeof(StatusTextData))

+	if (st == nullptr)

 		return 1;

 

 	HWND hwnd = WindowList_Find(pci->hWindowList, hContact);

@@ -431,7 +431,7 @@ void CScriverWindow::Reattach(HWND hwndContainer)
 

 static void RegisterStatusIcons()

 {

-	StatusIconData sid = { sizeof(sid) };

+	StatusIconData sid = {};

 	sid.szModule = SRMM_MODULE;

 	sid.dwId = 1;

 	sid.hIcon = GetCachedIcon("scriver_TYPING");

@@ -442,7 +442,7 @@ static void RegisterStatusIcons()
 

 void ChangeStatusIcons()

 {

-	StatusIconData sid = { sizeof(sid) };

+	StatusIconData sid = {};

 	sid.szModule = SRMM_MODULE;

 	sid.dwId = 1;

 	sid.hIcon = GetCachedIcon("scriver_TYPING");