Changed: Added more memory leaks checks

--HG--
branch : develop

code/nel/src/3d/driver/direct3d/driver_direct3d.cpp

@@ -32,6 +32,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d.h

@@ -480,12 +480,21 @@ public:
 	virtual ~CStateRecord() {}
 	// use STL allocator for fast alloc. this works because objects are small ( < 128 bytes)
 	void *operator new(size_t size) { return CStateRecord::Allocator.allocate(size); }
+	void *operator new(size_t size, int /* blockUse */, char const * /* fileName */, int /* lineNumber */)
+	{
+		// TODO: add memory leaks detector
+		return CStateRecord::Allocator.allocate(size);
+	}
 	void operator delete(void *block) { CStateRecord::Allocator.deallocate((uint8 *) block, 1); }
+	void operator delete(void *block, int /* blockUse */, char const* /* fileName */, int /* lineNumber */)
+	{
+		// TODO: add memory leaks detector
+		CStateRecord::Allocator.deallocate((uint8 *)block, 1);
+	}
 
 	static std::allocator<uint8> Allocator;
 };
 
-
 // record of a single .fx pass
 class CFXPassRecord
 {

code/nel/src/3d/driver/direct3d/driver_direct3d_index.cpp

@@ -25,6 +25,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp

@@ -17,6 +17,10 @@
 #include "stddirect3d.h"
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_light.cpp

@@ -26,6 +26,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_material.cpp

@@ -27,6 +27,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_matrix.cpp

@@ -26,6 +26,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp

@@ -29,6 +29,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_profile.cpp

@@ -19,6 +19,10 @@
 #include "driver_direct3d.h"
 #include "nel/misc/hierarchical_timer.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_render.cpp

@@ -27,6 +27,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp

@@ -20,6 +20,10 @@
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_texture.cpp

@@ -26,6 +26,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_uniform.cpp

@@ -18,6 +18,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp

@@ -26,6 +26,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/3d/driver/direct3d/driver_direct3d_vertex_program.cpp

@@ -18,6 +18,10 @@
 
 #include "driver_direct3d.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/georges/form.cpp

@@ -24,6 +24,10 @@
 #include "nel/georges/form.h"
 #include "nel/georges/form_loader.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace NLGEORGES

code/nel/src/georges/form_dfn.cpp

@@ -24,6 +24,10 @@
 #include "nel/georges/form_loader.h"
 #include "nel/georges/form_elm.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/georges/form_elm.cpp

@@ -25,6 +25,10 @@
 #include "nel/georges/form_loader.h"
 #include "nel/georges/type.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/georges/form_loader.cpp

@@ -27,6 +27,10 @@
 #include "nel/georges/form.h"
 #include "nel/georges/form_dfn.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/georges/header.cpp

@@ -22,6 +22,10 @@
 
 #include "nel/georges/header.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace NLGEORGES

code/nel/src/georges/stdgeorges.h

@@ -14,6 +14,16 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifndef STDGEORGES_H
+#define STDGEORGES_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #include "nel/misc/types_nl.h"
 #include <cmath>
 #include <list>
@@ -27,3 +37,5 @@
 
 // Include from libxml2
 #include <libxml/parser.h>
+
+#endif

code/nel/src/georges/type.cpp

@@ -27,6 +27,10 @@
 #include "nel/georges/form_loader.h"
 #include "nel/georges/type.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/sound/driver/dsound/buffer_dsound.cpp

@@ -23,6 +23,10 @@
 #include <windows.h>
 #include <mmsystem.h>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/sound/driver/dsound/listener_dsound.cpp

@@ -18,6 +18,9 @@
 #include "listener_dsound.h"
 #include "sound_driver_dsound.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp

@@ -31,6 +31,9 @@
 #include "sound_driver_dsound.h"
 #include "listener_dsound.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/driver/dsound/source_dsound.cpp

@@ -21,6 +21,9 @@
 #include "buffer_dsound.h"
 #include "listener_dsound.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 using namespace std;

code/nel/src/sound/driver/dsound/stddsound.h

@@ -14,6 +14,16 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifndef STDDSOUND_H
+#define STDDSOUND_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #include "nel/misc/types_nl.h"
 
 #define EAX_AVAILABLE 0
@@ -44,4 +54,5 @@
 #include "nel/sound/driver/source.h"
 #include "nel/sound/driver/listener.h"
 
+#endif
 /* end of file */

code/nel/src/sound/driver/fmod/buffer_fmod.cpp

@@ -25,6 +25,10 @@
 #	include <mmsystem.h>
 #endif
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/sound/driver/fmod/listener_fmod.cpp

@@ -18,6 +18,9 @@
 #include "listener_fmod.h"
 #include "sound_driver_fmod.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/nel/src/sound/driver/fmod/music_channel_fmod.cpp

@@ -18,6 +18,10 @@
 #include "music_channel_fmod.h"
 #include "sound_driver_fmod.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp

@@ -26,6 +26,10 @@
 #include <Windows.h>
 #endif
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/fmod/source_fmod.cpp

@@ -21,6 +21,9 @@
 #include "buffer_fmod.h"
 #include "listener_fmod.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 using namespace std;

code/nel/src/sound/driver/fmod/stdfmod.h

@@ -14,6 +14,16 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifndef STDFMOD_H
+#define STDFMOD_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #include <nel/misc/types_nl.h>
 
 #ifdef NL_OS_WINDOWS
@@ -42,4 +52,6 @@
 #include "nel/sound/driver/source.h"
 #include "nel/sound/driver/listener.h"
 
+#endif
+
 /* end of file */

code/nel/src/sound/driver/openal/buffer_al.cpp

@@ -18,6 +18,10 @@
 #include "sound_driver_al.h"
 #include "buffer_al.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace NLSOUND

code/nel/src/sound/driver/openal/effect_al.cpp

@@ -19,6 +19,10 @@
 #include "effect_al.h"
 #include "sound_driver_al.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 // using namespace NLMISC;
 

code/nel/src/sound/driver/openal/listener_al.cpp

@@ -18,6 +18,10 @@
 #include "listener_al.h"
 #include "sound_driver_al.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace NLSOUND {

code/nel/src/sound/driver/openal/sound_driver_al.cpp

@@ -22,6 +22,10 @@
 #include "ext_al.h"
 #include "effect_al.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/openal/source_al.cpp

@@ -22,6 +22,10 @@
 #include "source_al.h"
 #include "ext_al.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 // #define NLSOUND_DEBUG_GAIN
 
 using namespace std;

code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.cpp

@@ -20,6 +20,10 @@
 #include "buffer_xaudio2.h"
 #include "adpcm_xaudio2.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 // using namespace NLMISC;
 

code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp

@@ -20,6 +20,10 @@
 #include "buffer_xaudio2.h"
 #include "sound_driver_xaudio2.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/xaudio2/effect_xaudio2.cpp

@@ -21,6 +21,10 @@
 #include "listener_xaudio2.h"
 #include "effect_xaudio2.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp

@@ -20,6 +20,10 @@
 #include "sound_driver_xaudio2.h"
 #include "listener_xaudio2.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp

@@ -22,6 +22,10 @@
 #include "effect_xaudio2.h"
 #include "sound_driver_xaudio2.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp

@@ -26,6 +26,10 @@
 #include "effect_xaudio2.h"
 #include "source_xaudio2.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/ryzom/client/src/actions.cpp

@@ -22,6 +22,10 @@
 #include "events_listener.h"
 #include "interface_v3/interface_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/ryzom/client/src/actions_client.cpp

@@ -28,6 +28,9 @@
 #include "actions_client.h"
 #include "interface_v3/input_handler_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //

code/ryzom/client/src/animation.cpp

@@ -35,6 +35,9 @@
 #include "client_cfg.h"
 #include "entity_animation_manager.h"	// \todo GUIGUI : added to recompile animations at loading (to do better ?).
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //

code/ryzom/client/src/animation_fx.cpp

@@ -27,6 +27,10 @@
 #include "nel/3d/u_scene.h"
 #include "client_sheets/animation_fx_set_sheet.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern NL3D::UScene *Scene;
 
 

code/ryzom/client/src/animation_fx_id_array.cpp

@@ -23,6 +23,10 @@
 //
 #include "nel/3d/u_scene.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern NL3D::UScene *Scene;
 
 // *********************************************************************

code/ryzom/client/src/animation_fx_misc.cpp

@@ -20,4 +20,8 @@
 #include "animation_fx_misc.h"
 #include "animation_fx_id_array.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 CAnimationFXIDArray AnimFXMisc;

code/ryzom/client/src/animation_misc.cpp

@@ -27,6 +27,9 @@
 // 3d
 #include "nel/3d/u_track.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //

code/ryzom/client/src/animation_set.cpp

@@ -33,6 +33,10 @@
 #include "nel/georges/u_form_elm.h"
 #include "nel/georges/u_form_loader.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ///////////
 // USING //
 ///////////

code/ryzom/client/src/animation_state.cpp

@@ -30,6 +30,10 @@
 // Georges
 #include "nel/georges/u_form_elm.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ///////////
 // USING //
 ///////////

code/ryzom/client/src/app_bundle_utils.cpp

@@ -21,6 +21,10 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 std::string getAppBundlePath()
 {
 	static std::string s_cachedPathToBundle;

code/ryzom/client/src/attached_fx.cpp

@@ -27,6 +27,10 @@
 #include "time_client.h"
 #include "fx_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern NL3D::UScene *Scene;
 
 

code/ryzom/client/src/attack_list.cpp

@@ -29,6 +29,9 @@
 //
 #include <utility>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 H_AUTO_DECL(RZ_AttackList)
 

code/ryzom/client/src/auto_anim.cpp

@@ -33,6 +33,9 @@
 #include <string>
 #include <fstream>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //

code/ryzom/client/src/behaviour_context.cpp

@@ -19,6 +19,10 @@
 #include "stdpch.h"
 #include "behaviour_context.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 CBehaviourContext::CBehaviourContext()
 {
 }

code/ryzom/client/src/bg_downloader_access.cpp

@@ -31,6 +31,10 @@
 
 #include "nel/misc/win_thread.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace BGDownloader;
 using namespace NLMISC;
 

code/ryzom/client/src/browse_faq.cpp

@@ -17,6 +17,10 @@
 #include "stdpch.h"
 #include "browse_faq.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 void browseFAQ(NLMISC::CConfigFile &cf)

code/ryzom/client/src/camera.cpp

@@ -22,6 +22,10 @@
 #include "global.h"
 #include "misc.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace NL3D;
 

code/ryzom/client/src/character_cl.cpp

@@ -111,6 +111,9 @@
 #include "game_share/range_weapon_type.h"
 //
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ////////////
 // DEFINE //
@@ -137,10 +140,6 @@ using namespace std;
 using namespace MBEHAV;
 using namespace CLFECOMMON;
 
-#ifdef DEBUG_NEW
-#define new DEBUG_NEW
-#endif
-
 ////////////
 // EXTERN //
 ////////////

code/ryzom/client/src/commands.cpp

@@ -107,6 +107,9 @@
 // to desactive some commands
 //
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 ////////////////

code/ryzom/client/src/http_client_curl.cpp

@@ -26,6 +26,10 @@ using namespace NLMISC;
 using namespace NLNET;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 #define _Curl (CURL *)_CurlStruct
 
 

code/ryzom/client/src/r2/auto_group.cpp

@@ -21,6 +21,10 @@
 //
 #include "nel/misc/i18n.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 

code/ryzom/client/src/r2/config_var.cpp

@@ -17,6 +17,9 @@
 #include "stdpch.h"
 #include "config_var.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 namespace R2

code/ryzom/client/src/r2/displayer_base.cpp

@@ -23,6 +23,10 @@
 #include "nel/gui/lua_ihm.h"
 #include "nel/gui/interface_element.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace R2
 {
 

code/ryzom/client/src/r2/displayer_lua.cpp

@@ -20,6 +20,10 @@
 #include "../interface_v3/lua_ihm_ryzom.h"
 #include "editor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace R2
 {
 

code/ryzom/client/src/r2/displayer_visual.cpp

@@ -33,6 +33,10 @@
 //
 #include "r2_config.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 extern uint	SkipFrame;

code/ryzom/client/src/r2/displayer_visual_activity_sequence.cpp

@@ -23,6 +23,9 @@
 #include "../interface_v3/interface_manager.h"
 #include "nel/gui/view_renderer.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/ryzom/client/src/r2/displayer_visual_entity.cpp

@@ -58,6 +58,10 @@
 //
 #include "../sheet_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 
 using namespace NLMISC;
 using namespace NL3D;

code/ryzom/client/src/r2/displayer_visual_group.cpp

@@ -38,6 +38,10 @@
 #include "../time_client.h"
 //
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 class CGroupMap;
 
 using namespace R2;

code/ryzom/client/src/r2/displayer_visual_road.cpp

@@ -22,6 +22,9 @@
 #include "../global.h"
 //
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 using namespace NL3D;

code/ryzom/client/src/r2/displayer_visual_shape.cpp

@@ -33,6 +33,9 @@
 #include "nel/3d/u_visual_collision_manager.h"
 #include "nel/3d/u_visual_collision_entity.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/ryzom/client/src/r2/dmc/action_historic.cpp

@@ -21,6 +21,10 @@
 #include "../editor.h"
 #include "nel/gui/lua_ihm.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace R2
 {
 

code/ryzom/client/src/r2/dmc/client_edition_module.cpp

@@ -68,6 +68,9 @@
 
 #include <zlib.h>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 using namespace std;

code/ryzom/client/src/r2/dmc/com_lua_module.cpp

@@ -58,6 +58,9 @@ using namespace NLGUI;
 using namespace NLMISC;
 using namespace R2;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 std::map<lua_State*, CComLuaModule*> CComLuaModule::_Instance;

code/ryzom/client/src/r2/dmc/dmc.cpp

@@ -45,6 +45,9 @@
 #include <assert.h>
 
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLNET;
 using namespace NLMISC;

code/ryzom/client/src/r2/dmc/palette.cpp

@@ -21,6 +21,10 @@
 
 #include <assert.h>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace R2;
 
 namespace R2

code/ryzom/client/src/r2/dmc/property_accessor.cpp

@@ -21,6 +21,11 @@
 #include "game_share/object.h"
 
 #include <assert.h>
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace R2;
 
 

code/ryzom/client/src/r2/editor.cpp

@@ -115,6 +115,9 @@ using namespace NLGUI;
 #include "../far_tp.h"
 #include "nel/gui/lua_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 using namespace NLNET;
@@ -1628,8 +1631,17 @@ int CEditor::luaEnumInstances(CLuaState &ls)
 	mt.setValue("__gc", CLuaObject(ls));
 	//
 	void *newIter = ls.newUserData(sizeof(CInstanceEnumerator));
+
+#ifdef new
+#undef new
+#endif
+
 	CInstanceEnumerator *ie = new (newIter) CInstanceEnumerator;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 	ie->InstMap = &getEditor()._InstancesByDispName[classIndex];
 	ie->Current = ie->InstMap->begin();
 	mt.push();

code/ryzom/client/src/r2/entity_custom_select_box.cpp

@@ -21,6 +21,10 @@
 //
 #include "nel/misc/vector.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace R2

code/ryzom/client/src/r2/entity_sorter.cpp

@@ -20,6 +20,10 @@
 #include "../user_entity.h"
 #include "../time_client.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace R2

code/ryzom/client/src/r2/instance.cpp

@@ -30,6 +30,9 @@
 //
 #include "displayer_visual_entity.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/ryzom/client/src/r2/island_collision.cpp

@@ -33,6 +33,10 @@
 //
 #include "nel/3d/texture_file.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern CContinentManager ContinentMngr;
 
 using namespace NL3D;

code/ryzom/client/src/r2/lua_event_forwarder.cpp

@@ -18,6 +18,9 @@
 #include "lua_event_forwarder.h"
 #include "nel/gui/lua_object.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace R2
 {

code/ryzom/client/src/r2/mesh_array.cpp

@@ -21,6 +21,9 @@
 #include "../global.h"
 #include "../misc.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 using namespace NL3D;

code/ryzom/client/src/r2/npc_editor.cpp

@@ -27,6 +27,10 @@
 
 #include "../sheet_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace NL3D;
 using namespace std;

code/ryzom/client/src/r2/object_factory_client.cpp

@@ -21,6 +21,10 @@
 #include "nel/gui/lua_ihm.h"
 #include "../interface_v3/lua_ihm_ryzom.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace R2
 {
 
@@ -319,7 +323,17 @@ void CObjectTableClient::pushOnLuaStack(CLuaState &state, CLuaObject &metatable)
 		nlassert(metatable.isValid());
 		// return a new refptr on the sub table
 		void *block = state.newUserData(sizeof(TRefPtrConst));
+
+#ifdef new
+#undef new
+#endif
+
 		new (block) CObjectTable::TRefPtrConst(this); // create in place
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 		metatable.push();
 		state.setMetaTable(-2);
 		_Ref.pop(state);

code/ryzom/client/src/r2/palette_node.cpp

@@ -18,6 +18,9 @@
 #include "palette_node.h"
 #include "editor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 namespace R2

code/ryzom/client/src/r2/prim_render.cpp

@@ -29,6 +29,9 @@
 #include "nel/gui/view_renderer.h"
 #include "../interface_v3/group_map.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NL3D;
 using namespace NLMISC;

code/ryzom/client/src/r2/r2_config.cpp

@@ -17,6 +17,9 @@
 #include "stdpch.h"
 #include "r2_config.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/ryzom/client/src/r2/r2_lua.cpp

@@ -21,6 +21,10 @@
 #include "stdpch.h"
 #include "r2_lua.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 // stupid function to remove VC6 warnings
 #ifdef NL_COMP_VC6
 void foo_r2_lua_cpp() {}

code/ryzom/client/src/r2/tool.cpp

@@ -42,6 +42,10 @@
 //
 #include "nel/3d/packed_world.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern NLPACS::UGlobalRetriever	*GR;
 
 

code/ryzom/client/src/r2/tool_choose_pos.cpp

@@ -35,6 +35,10 @@
 #include "dmc/idmc.h"
 #include "r2_config.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLPACS;
 using namespace NLMISC;
 

code/ryzom/client/src/r2/tool_choose_pos_lua.cpp

@@ -21,6 +21,10 @@
 //
 #include "nel/misc/vectord.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLPACS;
 using namespace NLMISC;
 

code/ryzom/client/src/r2/tool_create_entity.cpp

@@ -41,6 +41,10 @@
 #include "game_share/player_visual_properties.h"
 #include "game_share/visual_slot_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLPACS;
 using namespace NLMISC;
 using namespace std;

code/ryzom/client/src/r2/tool_draw_prim.cpp

@@ -34,6 +34,9 @@
 // tmp tmp
 #include "nel/gui/ctrl_quad.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace NLMISC;
 

code/ryzom/client/src/r2/tool_maintained_action.cpp

@@ -20,6 +20,10 @@
 #include "editor.h"
 #include "../interface_v3/interface_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace R2
 {
 

code/ryzom/client/src/r2/tool_new_vertex.cpp

@@ -23,6 +23,10 @@
 //
 #include "nel/misc/i18n.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 namespace R2