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

10 files changed, 10 insertions, 12 deletions

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index e7ab0681ed..a86f79f917 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -532,7 +532,7 @@ static int AwayMsgOptInitialise(WPARAM wParam, LPARAM)
 	if (protoModeMsgFlags == 0)

 		return 0;

 

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 870000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AWAYMSG);

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 105e9127c9..8a5536ec24 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -724,7 +724,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar
 

 int OptionsInitialize(WPARAM wParam, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 910000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 9f1fa37802..83e9154511 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -421,7 +421,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 

 int ClcOptInit(WPARAM wParam, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

 	odp.pszGroup = LPGEN("Contact list");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index b3c78131f7..c39709e9ee 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -237,7 +237,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 int CListOptInit(WPARAM wParam, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = -1000000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index 4cd01986b7..5a755bec3c 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -321,7 +321,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 int CluiOptInit(WPARAM wParam, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);

 	odp.pszTitle = LPGEN("Window");

diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp
index ad8c3560b9..8fc3cfc8b3 100644
--- a/src/core/stdfile/src/fileopts.cpp
+++ b/src/core/stdfile/src/fileopts.cpp
@@ -224,7 +224,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 int FileOptInitialise(WPARAM wParam, LPARAM)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 900000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILETRANSFER);

diff --git a/src/core/stdidle/src/idle.cpp b/src/core/stdidle/src/idle.cpp
index 7e1357e107..169d95148c 100644
--- a/src/core/stdidle/src/idle.cpp
+++ b/src/core/stdidle/src/idle.cpp
@@ -342,7 +342,7 @@ static INT_PTR CALLBACK IdleOptsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 static int IdleOptInit(WPARAM wParam, LPARAM)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 100000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_IDLE);

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 74788bd360..f7e1ddeb2a 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -557,7 +557,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 

 static int OptInitialise(WPARAM wParam, LPARAM)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 910000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGDLG);

diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp
index 9884231150..3b6e387dd0 100644
--- a/src/core/stduserinfo/src/stdinfo.cpp
+++ b/src/core/stduserinfo/src/stdinfo.cpp
@@ -579,7 +579,7 @@ int DetailsInit(WPARAM wParam, LPARAM lParam)
 	if (GetContactProto(lParam) == 0)

 		return 0;

 

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

 

 	odp.pfnDlgProc = SummaryDlgProc;

diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index 0ed8404af4..132c895318 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -135,14 +135,12 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE *odp = (OPTIONSDIALOGPAGE*)lParam;

 	struct DetailsPageInit *opi = (struct DetailsPageInit*)wParam;

 

-	if (odp == NULL || opi == NULL) return 1;

-	if (odp->cbSize != sizeof(OPTIONSDIALOGPAGE))

+	if (odp == NULL || opi == NULL)

 		return 1;

 

 	opi->odp = (OPTIONSDIALOGPAGE*)mir_realloc(opi->odp, sizeof(OPTIONSDIALOGPAGE)*(opi->pageCount + 1));

 	OPTIONSDIALOGPAGE *dst = opi->odp + opi->pageCount;

 	memset(dst, 0, sizeof(OPTIONSDIALOGPAGE));

-	dst->cbSize = sizeof(OPTIONSDIALOGPAGE);

 	dst->hInstance = odp->hInstance;

 	dst->pfnDlgProc = odp->pfnDlgProc;

 	dst->position = odp->position;