From 5d2d95d9492b9d40aed28138bb9d085bf58e4f99 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Aug 2013 17:25:14 +0000 Subject: memory allocation problem git-svn-id: http://svn.miranda-ng.org/main/trunk@5773 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/utils.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index ea00b2c729..0d818bf251 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -1192,7 +1192,6 @@ static wchar_t* warnings[] = { CWarning::CWarning(const wchar_t *tszTitle, const wchar_t *tszText, const UINT uId, const DWORD dwFlags) : m_szTitle( mir_wstrdup(tszTitle)), m_szText( mir_wstrdup(tszText)) - { m_uId = uId; m_hFontCaption = 0; @@ -1203,15 +1202,8 @@ CWarning::CWarning(const wchar_t *tszTitle, const wchar_t *tszText, const UINT u CWarning::~CWarning() { - delete m_szText; - delete m_szTitle; - if (m_hFontCaption) ::DeleteObject(m_hFontCaption); - -#if defined(__LOGDEBUG_) - _DebugTraceW(L"destroy object"); -#endif } LRESULT CWarning::ShowDialog() const @@ -1220,10 +1212,8 @@ LRESULT CWarning::ShowDialog() const ::CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_WARNING), 0, stubDlgProc, reinterpret_cast(this)); return 0; } - else { - LRESULT res = ::DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_WARNING), 0, stubDlgProc, reinterpret_cast(this)); - return(res); - } + + return ::DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_WARNING), 0, stubDlgProc, reinterpret_cast(this)); } __int64 CWarning::getMask() @@ -1234,7 +1224,6 @@ __int64 CWarning::getMask() DWORD dwHigh = M.GetDword("cWarningsH", 0); mask = ((((__int64)dwHigh) << 32) & 0xffffffff00000000) | dwLow; - return(mask); } -- cgit v1.2.3