From a697754351436b6d0066b77b0fd71aeb8c45be3d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 15 Apr 2015 15:47:29 +0000
Subject: after commit #12797 field OPTIONSDIALOGPAGE::cbSize became an
 atavism, and therefore removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@12840 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/UserInfoEx/src/classPsTree.cpp   | 2 +-
 plugins/UserInfoEx/src/dlg_propsheet.cpp | 7 +------
 plugins/UserInfoEx/src/psp_options.cpp   | 3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'plugins/UserInfoEx/src')

diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index 40efabafce..15b6bf5f8a 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -127,7 +127,7 @@ int CPsTree::AddDummyItem(LPCSTR pszGroup)
 		psh._pPages	 = _pItems;
 		psh._numPages = _numItems;
 
-		OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+		OPTIONSDIALOGPAGE odp = { 0 };
 		odp.hInstance = ghInst;
 		odp.flags = ODPF_TCHAR;
 		odp.ptszTitle = mir_utf8decodeT(pszGroup);
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 6ebf3bba69..265a885574 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -352,11 +352,6 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam)
 	if (pPsh == NULL || odp == NULL || pPsh->_dwSize != sizeof(CPsHdr))
 		return 1;
 
-	if (odp->cbSize != sizeof(OPTIONSDIALOGPAGE) && odp->cbSize != OPTIONPAGE_OLD_SIZE) {
-		MsgErr(NULL, LPGENT("The page to add has invalid size %d bytes!"), odp->cbSize);
-		return 1;
-	}
-
 	// try to check whether the flag member is initialized or not
 	odp->flags = odp->flags > (ODPF_UNICODE | ODPF_BOLDGROUPS | ODPF_ICON | PSPF_PROTOPREPENDED) ? 0 : odp->flags;
 
@@ -511,7 +506,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam)
 	if (!(pPsh->_dwFlags & PSF_PROTOPAGESONLY)) {
 		BYTE bChangeDetailsEnabled = myGlobals.CanChangeDetails && db_get_b(NULL, MODNAME, SET_PROPSHEET_CHANGEMYDETAILS, FALSE);
 		if (lParam || bChangeDetailsEnabled) {
-			OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+			OPTIONSDIALOGPAGE odp = { 0 };
 			odp.hInstance = ghInst;
 			odp.flags = ODPF_ICON | ODPF_TCHAR;
 			odp.ptszGroup = IcoLib_GetDefaultIconFileName();
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index ee7a3547bb..10e733a507 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -1039,12 +1039,11 @@ static int OnInitOptions(WPARAM wParam, LPARAM lParam)
 {
 	DlgContactInfoInitTreeIcons();
 
-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.position = 95400;
 	odp.hInstance = ghInst;
 	odp.pszTitle = LPGEN(MODULELONGNAME);
 	odp.pszGroup = LPGEN("Contacts");
-	odp.cbSize = sizeof(odp);
 
 	// Common page
 	odp.pszTab = LPGEN("Common");
-- 
cgit v1.2.3