diff options
author | George Hazan <george.hazan@gmail.com> | 2015-04-15 15:47:29 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-04-15 15:47:29 +0000 |
commit | a697754351436b6d0066b77b0fd71aeb8c45be3d (patch) | |
tree | c2821a76e17eb003fe14b82b91ccb8b88dbe3adc /src/core/stduserinfo | |
parent | 2e3b0d5d40f1113887bd67e6ba227b780c4293cd (diff) |
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
Diffstat (limited to 'src/core/stduserinfo')
-rw-r--r-- | src/core/stduserinfo/src/stdinfo.cpp | 2 | ||||
-rw-r--r-- | src/core/stduserinfo/src/userinfo.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
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;
|