From a697754351436b6d0066b77b0fd71aeb8c45be3d Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- src/modules/options/options.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/modules/options/options.cpp') diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index a9975328c8..dce2320f71 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -1291,15 +1291,12 @@ static INT_PTR AddOptionsPage(WPARAM wParam, LPARAM lParam) { OPTIONSDIALOGPAGE *odp = (OPTIONSDIALOGPAGE*)lParam, *dst; OptionsPageInit *opi = (OptionsPageInit*)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)); dst = opi->odp + opi->pageCount; - memset(dst, 0, sizeof(OPTIONSDIALOGPAGE)); - memcpy(dst, odp, odp->cbSize); + memcpy(dst, odp, sizeof(OPTIONSDIALOGPAGE)); if (odp->ptszTitle != NULL) { if (odp->flags & ODPF_UNICODE) -- cgit v1.2.3