[Amis-vcs] SF.net SVN: amis: [2169] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <mar...@us...> - 2007-09-25 12:58:10
|
Revision: 2169 http://amis.svn.sourceforge.net/amis/?rev=2169&view=rev Author: marisademeglio Date: 2007-09-25 05:58:13 -0700 (Tue, 25 Sep 2007) Log Message: ----------- memory leak testing and cleanup Modified Paths: -------------- branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.cpp branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.vcproj branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp Modified: branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.cpp =================================================================== --- branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.cpp 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.cpp 2007-09-25 12:58:13 UTC (rev 2169) @@ -1,7 +1,6 @@ // testAmisCore.cpp : Defines the entry point for the console application. // -#include <vld.h> #ifndef TESTAMISCORE #define TESTAMISCORE @@ -18,6 +17,9 @@ #include "ambulant/net/url.h" +#include <vld.h> + + #endif void doPhraseNavInputLoop(amis::dtb::Dtb*); @@ -29,7 +31,7 @@ int _tmain(int argc, _TCHAR* argv[]) { amis::dtb::Dtb* book = new amis::dtb::Dtb(); - if (!book->open("c:\\daisybooks\\Mountains_skip\\ncc.html", "c:\\daisybooks\\bmk\\")) + if (!book->open("file://c:/daisybooks/Mountains_skip/ncc.html", "file://c:/daisybooks/bmk/")) //if (!book->open("c:\\dtb\\ValidZedFromMarkus\\06-speechgen.opf", "c:\\dtb\\bmk\\")) //if (!book->open("d:\\FullPackage.opf", "c:\\dtb\\bmk\\")) cout<<"Error opening book"<<endl; Modified: branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.vcproj =================================================================== --- branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.vcproj 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisCore/testAmisCoreWin32/testAmisCore.vcproj 2007-09-25 12:58:13 UTC (rev 2169) @@ -12,18 +12,18 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="../../../bin" + OutputDirectory="../../bin" IntermediateDirectory="Debug" ConfigurationType="1" CharacterSet="1"> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="C:\devel\ambulant\include;"C:\Program Files\Visual Leak Detector\include";../../include" + AdditionalIncludeDirectories="C:\devel\ambulant\include;"C:\Program Files\Visual Leak Detector";../include" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="3" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" @@ -35,8 +35,8 @@ AdditionalDependencies="xerces-c_2D.lib libambulant_shwin32_D.lib AmisCoreD.lib" OutputFile="$(OutDir)/testAmisCoreD.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""C:\Program Files\Visual Leak Detector\lib";../../../../../../ambulant/lib/win32;../../../lib" - IgnoreDefaultLibraryNames="uafxcwd.lib;uafxcw.lib;LIBCD.lib;LIBC.lib;msvcrt.lib;libcmt.lib;libcmtd.lib" + AdditionalLibraryDirectories="../../../../../ambulant/lib/win32;../../lib;"C:\Program Files\Visual Leak Detector"" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/testAmisCore.pdb" SubSystem="1" Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj =================================================================== --- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj 2007-09-25 12:58:13 UTC (rev 2169) @@ -20,7 +20,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";../3rdPartyAudio;../mffmTimeCode;" + AdditionalIncludeDirectories="include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";../3rdPartyAudio;../mffmTimeCode;"C:\Program Files\Visual Leak Detector"" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -37,7 +37,7 @@ Name="VCLinkerTool" AdditionalDependencies="AmisCoreD.lib xerces-c_2D.lib libambulant_shwin32_D.lib AmisAudioD.lib vorbisfile_static.lib vorbisenc_static.lib vorbis_static.lib ogg_static.lib libmad.lib stlib.lib fftw3.lib audiere.lib" LinkIncremental="2" - AdditionalLibraryDirectories="../lib;../../../../ambulant/lib/win32;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Lib\i386"" + AdditionalLibraryDirectories="../lib;../../../../ambulant/lib/win32;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Lib\i386";"C:\Program Files\Visual Leak Detector"" IgnoreDefaultLibraryNames="uafxcwd.lib;uafxcw.lib;LIBCD.lib;LIBC.lib;msvcrt.lib;libcmt.lib" GenerateDebugInformation="TRUE" SubSystem="2" Modified: branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h =================================================================== --- branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h 2007-09-25 12:58:13 UTC (rev 2169) @@ -21,12 +21,13 @@ */ // AmisGuiMFC2.h : main header file for the AmisGuiMFC2 application // + #pragma once - #ifndef __AFXWIN_H__ #error include 'stdafx.h' before including this file for PCH #endif + #include "resource.h" // main symbols #include <string> Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-09-25 12:58:13 UTC (rev 2169) @@ -23,9 +23,16 @@ #include "stdafx.h" #include "../resource.h" + +//visual leak detector +//http://dmoulding.googlepages.com/vld +#include "vld.h" + + #include "dtb/nav/NavModel.h" #include "DtbWithHooks.h" +#include "Preferences.h" #include "io/RecentBooksFileIO.h" @@ -39,6 +46,7 @@ #include "gui/TextRenderBrain.h" #include "gui/sidebar/AmisSidebar.h" +#include "gui/sidebar/AmisSidebarLoader.h" #include "gui/dialogs/AmisFileDialog.h" #include "gui/dialogs/AboutDialog.h" @@ -179,6 +187,14 @@ if (m_hMDIAccel != NULL)FreeResource(m_hMDIAccel); amis::dtb::DtbWithHooks::Instance()->DestroyInstance(); + amis::Preferences::Instance()->DestroyInstance(); + amis::gui::sidebar::AmisSidebarLoader::Instance()->DestroyInstance(); + amis::gui::TextRenderBrain::Instance()->DestroyInstance(); + amis::gui::MenuManip::Instance()->DestroyInstance(); + amis::gui::MainWndParts::Instance()->DestroyInstance(); + + if (mpRecentBooks) delete mpRecentBooks; + return CWinApp::ExitInstance(); } Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2007-09-25 12:58:13 UTC (rev 2169) @@ -251,6 +251,7 @@ { topView = NULL; MainWndParts::Instance()->mpMmView = NULL; + gui::dx::dx_player::cleanup(); } BOOL MmView::PreCreateWindow(CREATESTRUCT& cs) Modified: branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp 2007-09-25 12:23:34 UTC (rev 2168) +++ branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp 2007-09-25 12:58:13 UTC (rev 2169) @@ -78,10 +78,20 @@ mpFontCss = NULL; mpContrastCss = NULL; mpDefaultCss = NULL; + } TextRenderBrain::~TextRenderBrain() { + + //these crash.. + + /*if (mpFontCss) delete mpFontCss; + if (mpContrastCss) delete mpContrastCss; + if (mpDefaultCss) delete mpDefaultCss; + */ + + //TODO: should delete variants too } void TextRenderBrain::highlightUriTarget(amis::TextNode* pText) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |