- eliminated crash in Punto Switcher's dll during exit;

- removed references to the callee's local thread data in QueueUserAPC;

git-svn-id: http://svn.miranda-ng.org/main/trunk@683 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 4 insertions, 0 deletions

diff --git a/include/m_core.h b/include/m_core.h
index fc0134a621..14c72c0a37 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -503,6 +503,8 @@ __forceinline char* mir_utf8decodeA(const char* src)
 

 ///////////////////////////////////////////////////////////////////////////////

 

+MIR_CORE_DLL(void) UnloadCoreModule(void);

+

 #if defined(__cplusplus)

 }

 #endif

diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index 5815e410a4..76556160a6 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -42,9 +42,11 @@ template<class T> class mir_ptr
 	T* data;

 

 public:

+	__inline mir_ptr() : data((T*)mir_calloc(sizeof(T))) {}

 	__inline mir_ptr(T* _p) : data(_p) {}

 	__inline ~mir_ptr() { mir_free(data); }

 	__inline T* operator= (T* _p) { if (data) mir_free(data); data = _p; return data; }

+	__inline T* operator->() const { return data; }

 	__inline operator T*() const { return data; }

 	__inline operator INT_PTR() const { return (INT_PTR)data; }

 };