MString moved to the core

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

6 files changed, 159 insertions, 0 deletions

diff --git a/src/mir_core/mir_core.def b/src/mir_core/mir_core.def
index f9e990ab40..bfd34cb47d 100644
--- a/src/mir_core/mir_core.def
+++ b/src/mir_core/mir_core.def
@@ -231,3 +231,10 @@ bin2hex                       @228
 bin2hexW                      @229

 mir_hmac_sha1                 @230

 mir_base64_encodebuf          @231

+mirstr_allocate               @232

+mirstr_free                   @233

+mirstr_realloc                @234

+mirstr_getNil                 @235

+mirstr_lock                   @236

+mirstr_release                @237

+mirstr_unlock                 @238

diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj
index 0b5efe22f5..cc805973b3 100644
--- a/src/mir_core/mir_core_10.vcxproj
+++ b/src/mir_core/mir_core_10.vcxproj
@@ -99,6 +99,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ClCompile Include="logger.cpp" />

+    <ClCompile Include="mstring.cpp" />

     <ClCompile Include="protos.cpp" />

     <ClCompile Include="stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/src/mir_core/mir_core_10.vcxproj.filters b/src/mir_core/mir_core_10.vcxproj.filters
index 1fafc175f9..b4fe537533 100644
--- a/src/mir_core/mir_core_10.vcxproj.filters
+++ b/src/mir_core/mir_core_10.vcxproj.filters
@@ -100,6 +100,9 @@
     <ClCompile Include="logger.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="mstring.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="commonheaders.h">

diff --git a/src/mir_core/mir_core_11.vcxproj b/src/mir_core/mir_core_11.vcxproj
index e30f2719cc..42572f7442 100644
--- a/src/mir_core/mir_core_11.vcxproj
+++ b/src/mir_core/mir_core_11.vcxproj
@@ -94,6 +94,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ClCompile Include="logger.cpp" />

+    <ClCompile Include="mstring.cpp" />

     <ClCompile Include="protos.cpp" />

     <ClCompile Include="stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/src/mir_core/mir_core_11.vcxproj.filters b/src/mir_core/mir_core_11.vcxproj.filters
index 75eaf973e4..0b660b44ed 100644
--- a/src/mir_core/mir_core_11.vcxproj.filters
+++ b/src/mir_core/mir_core_11.vcxproj.filters
@@ -97,6 +97,9 @@
     <ClCompile Include="logger.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="mstring.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="commonheaders.h">

diff --git a/src/mir_core/mstring.cpp b/src/mir_core/mstring.cpp
new file mode 100644
index 0000000000..fc1b4d60f8
--- /dev/null
+++ b/src/mir_core/mstring.cpp
@@ -0,0 +1,144 @@
+/*

+

+Miranda IM: the free IM client for Microsoft* Windows*

+

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, 

+all portions of this codebase are copyrighted to the people

+listed in contributors.txt.

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation; either version 2

+of the License, or (at your option) any later version.

+

+This program is distributed in the hope that it will be useful, 

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+*/

+

+#include "commonheaders.h"

+#include "m_string.h"

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// CMBaseString 

+

+class CNilMStringData : public CMStringData

+{

+public:

+	CNilMStringData();

+

+public:

+	wchar_t achNil[2];

+};

+

+CNilMStringData::CNilMStringData()

+{

+	nRefs = 2;  // Never gets freed

+	nDataLength = 0;

+	nAllocLength = 0;

+	achNil[0] = 0;

+	achNil[1] = 0;

+}

+

+static CNilMStringData m_nil;

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// CMBaseString 

+

+MIR_CORE_DLL(CMStringData*) mirstr_allocate(int nChars, int nCharSize)

+{

+	nChars++; // nil char

+	size_t nDataBytes = nCharSize * nChars;

+	size_t nTotalSize = nDataBytes + sizeof(CMStringData);

+

+	CMStringData *pData = static_cast<CMStringData*>(malloc(nTotalSize));

+	if (pData == NULL)

+		return NULL;

+

+	pData->nRefs = 1;

+	pData->nAllocLength = nChars - 1;

+	pData->nDataLength = 0;

+	return pData;

+}

+

+MIR_CORE_DLL(void) mirstr_free(CMStringData *pData)

+{

+	free(pData);

+}

+

+MIR_CORE_DLL(CMStringData*) mirstr_realloc(CMStringData* pData, int nChars, int nCharSize)

+{

+	nChars++; // nil char

+	ULONG nDataBytes = nCharSize * nChars;

+	ULONG nTotalSize = nDataBytes + sizeof(CMStringData);

+

+	CMStringData *pNewData = static_cast<CMStringData*>(realloc(pData, nTotalSize));

+	if (pNewData == NULL)

+		return NULL;

+

+	pNewData->nAllocLength = nChars - 1;

+	return pNewData;

+}

+

+MIR_CORE_DLL(CMStringData*) mirstr_getNil()

+{

+	m_nil.AddRef();

+	return &m_nil;

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// CMStringData

+

+MIR_CORE_DLL(void) mirstr_lock(CMStringData* pThis)

+{

+	pThis->nRefs--;  // Locked buffers can't be shared, so no interlocked operation necessary

+	if (pThis->nRefs == 0)

+		pThis->nRefs = -1;

+}

+

+MIR_CORE_DLL(void) mirstr_release(CMStringData* pThis)

+{

+	if (InterlockedDecrement(&pThis->nRefs) <= 0)

+		mirstr_free(pThis);

+}

+

+MIR_CORE_DLL(void) mirstr_unlock(CMStringData* pThis)

+{

+	if (pThis->IsLocked())

+	{

+		pThis->nRefs++;  // Locked buffers can't be shared, so no interlocked operation necessary

+		if (pThis->nRefs == 0)

+			pThis->nRefs = 1;

+	}

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// ChTraitsCRT<wchar_t>

+

+int __stdcall ChTraitsCRT<wchar_t>::GetFormattedLength( LPCWSTR pszFormat, va_list args )

+{

+	return _vscwprintf(pszFormat, args);

+}

+

+int __stdcall ChTraitsCRT<wchar_t>::Format( LPWSTR pszBuffer, size_t nLength, LPCWSTR pszFormat, va_list args)

+{

+	return _vsnwprintf(pszBuffer, nLength, pszFormat, args);

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// ChTraitsCRT<char>

+

+int __stdcall ChTraitsCRT<char>::GetFormattedLength( LPCSTR pszFormat, va_list args )

+{

+	return _vscprintf(pszFormat, args);

+}

+

+int __stdcall ChTraitsCRT<char>::Format( LPSTR pszBuffer, size_t nlength, LPCSTR pszFormat, va_list args )

+{

+	return vsprintf_s(pszBuffer, nlength, pszFormat, args);

+}