MWGIS-240; initial work on saving Shapefiles with UTF-8 code page

Author: jerryfaust

src/COM classes/TableClass.cpp

@@ -718,6 +718,9 @@ bool CTableClass::SaveToFile(const CStringW& dbfFilename, bool updateFileInPlace
 		return false;
 	}
 
+	// is the Shapefile UTF-8 (if unspecified or specified as UTF-8)
+	bool isUTF8 = (DBFGetCodePage(_dbfHandle) == nullptr || strcmp(DBFGetCodePage(_dbfHandle), "UTF-8") == 0);
+
 	// joined fields must be removed; they will be restored in the process of reopening table
 	// after saving operation
 	this->RemoveJoinedFields();
@@ -799,7 +802,7 @@ bool CTableClass::SaveToFile(const CStringW& dbfFilename, bool updateFileInPlace
 			continue;
 		}
 
-		if (!WriteRecord(newdbfHandle, rowIndex, ++currentRowIndex))
+		if (!WriteRecord(newdbfHandle, rowIndex, ++currentRowIndex, isUTF8))
 		{
 			ErrorMessage(tkDBF_CANT_WRITE_ROW);
 			return false;
@@ -935,6 +938,8 @@ void CTableClass::LoadDefaultFields()
 		field->put_Width(fwidth);
 		field->put_Precision(fdecimals);
 		field->put_Type((FieldType)type);
+		//// field has not really been modified
+		//((CField*)field)->SetIsUpdated(false);
 
 		FieldWrapper* fw = new FieldWrapper();
 		fw->oldIndex = i;
@@ -1440,7 +1445,7 @@ bool CTableClass::ReadRecord(long RowIndex)
 //		WriteRecord()
 // *******************************************************************
 //Write a cached RecordWrapper into dbf file 
-bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex)
+bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex, bool isUTF8)
 {
 	AFX_MANAGE_STATE(AfxGetStaticModuleState())
 		USES_CONVERSION;
@@ -1454,7 +1459,7 @@ bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowI
 	if (fromRowIndex < 0 || fromRowIndex >= RowCount())
 		return false;
 
-	char * nonstackString = NULL;
+	const char * nonstackString = NULL;
 
 	for (long i = 0; i < FieldCount(); i++)
 	{
@@ -1468,7 +1473,7 @@ bool CTableClass::WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowI
 		{
 			if (val.vt == VT_BSTR)
 			{
-				nonstackString = Utility::SYS2A(val.bstrVal);
+				nonstackString = Utility::ConvertBSTRToLPSTR(val.bstrVal, (isUTF8 ? CP_UTF8 : CP_ACP)); // ((LPCSTR)Utility::ConvertToUtf8(val.bstrVal)); // Utility::SYS2A(val.bstrVal);
 				DBFWriteStringAttribute(dbfHandle, toRowIndex, i, nonstackString);
 				delete[] nonstackString;
 				nonstackString = NULL;

src/COM classes/TableClass.h

@@ -206,7 +206,7 @@ class ATL_NO_VTABLE CTableClass :
 	long RowCount() { return _rows.size(); }
 	long FieldCount() { return _fields.size(); }
 	bool ReadRecord(long RowIndex);
-	bool WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex);
+	bool WriteRecord(DBFInfo* dbfHandle, long fromRowIndex, long toRowIndex, bool isUTF8 = false);
 	void ClearRow(long rowIndex);
 	FieldType GetFieldType(long fieldIndex);
 	long GetFieldPrecision(long fieldIndex);

src/Utilities/UtilityFunctions.cpp

@@ -87,21 +87,21 @@ namespace Utility
 	//		ConvertBSTRToLPSTR
 	// ********************************************************
 	//Rob Cairns 29-Aug-2009
-	char* ConvertBSTRToLPSTR(BSTR bstrIn)
+	char* ConvertBSTRToLPSTR(BSTR bstrIn, UINT codePage /* = CP_ACP */)
 	{
 		LPSTR pszOut = nullptr;
 		if (bstrIn != nullptr)
 		{
 			int nInputStrLen = SysStringLen(bstrIn);
 
 			// Double NULL Termination
-			int nOutputStrLen = WideCharToMultiByte(CP_ACP, 0, bstrIn, nInputStrLen, nullptr, 0, nullptr, nullptr) + 2;
+			int nOutputStrLen = WideCharToMultiByte(codePage, 0, bstrIn, nInputStrLen, nullptr, 0, nullptr, nullptr) + 2;
 			pszOut = new char[nOutputStrLen];
 
 			if (pszOut)
 			{
 				memset(pszOut, 0x00, sizeof(char)*nOutputStrLen);
-				WideCharToMultiByte(CP_ACP, 0, bstrIn, nInputStrLen, pszOut, nOutputStrLen, nullptr, nullptr);
+				WideCharToMultiByte(codePage, 0, bstrIn, nInputStrLen, pszOut, nOutputStrLen, nullptr, nullptr);
 			}
 		}
 		return pszOut;

src/Utilities/UtilityFunctions.h

@@ -13,7 +13,7 @@ namespace Utility
 	BSTR Variant2BSTR(VARIANT* val, CString floatFormat);
 	char * SYS2A(BSTR str);
 	WCHAR* StringToWideChar(CString s);
-	char* ConvertBSTRToLPSTR (BSTR bstrIn);
+	char* ConvertBSTRToLPSTR (BSTR bstrIn, UINT codePage = CP_ACP);
 	CString ReplaceNoCase( LPCTSTR instr, LPCTSTR oldstr, LPCTSTR newstr );
 
 	CString UrlEncode(CString s);