WebSVN – spk – Diff – /libspk/src/BaseFile.cpp

 /*
 	Func:   CreateFilesLine
 	Return: String - returns the full string for files list
 	Desc:   Creates a signle line list of all the files
 */
-Utils::String CBaseFile::createFilesLine(SSPKHeader2 *header, CProgressInfo* progress) const
+Utils::WString CBaseFile::createFilesLine(SSPKHeader2 *header, CProgressInfo* progress) const
+{
 	Utils::WString line;
 	if (progress)
+	{
 			++header->iNumFiles;
 			header->lFullSize += (file->GetDataSize() + 4);
+		}
+	}
-	return line.toString();
+	return line;
+}
 /*
 ######################################################################################
 ##########							Reading Functions			    		##########
 		else {
 			Utils::WString to = pCheckFile->getDirectory(this);
 			CDirIO Dir(sDestination);
 			if ( !Dir.exists(to) ) {
 				if ( !Dir.create ( to ) ) {
-					if ( errorStr )	errorStr->pushBack(to.toString(), ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
+					if ( errorStr )	errorStr->pushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
 					return false;
+				}
-				if ( errorStr )	errorStr->pushBack(to.toString(), ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+				if ( errorStr )	errorStr->pushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+			}
 			Utils::WString destfile = sDestination + L"/" + pCheckFile->getNameDirectory(this);
 			if ( CFileIO::Exists(destfile) ) CFileIO::Remove(destfile);
 			CLog::logf(CLog::Log_Install, 1, "Adjusting existing filename, %s => %s", pCheckFile->filePointer().c_str(), destfile.c_str());
 					CLog::log(CLog::Log_Install, 2, "Copying data into existing file");
+				}
 				Utils::WString fpointer = fit->filePointer();
 				_iLastError = SPKERR_CREATEDIRECTORY;
-				Utils::WString dir = CFileIO(fit->filePointer()).dir().toString();
+				Utils::WString dir = CFileIO(fit->filePointer()).dir();
 				dir = dir.findRemove(destdir);
 				if (!dir.empty() && (dir[0] == '/' || dir[0] == '\\'))
 					dir.erase(0, 1);
+		}
+	}
 	else if ( first.Compare(L"Game:") )
 		this->AddGameCompatability(rest, L"");
 	else if ( first.Compare(L"GameCompat:") )
-		this->AddGameCompatability(rest.token(L" ", 1), rest.tokens(L" ", 2).toString());
+		this->AddGameCompatability(rest.token(L" ", 1), rest.tokens(L" ", 2));
 	else if ( first.Compare(L"GameCompatExact:") )
-		this->AddGameCompatability(rest.token(L" ", 1), rest.tokens(L" ", 2).toString());
+		this->AddGameCompatability(rest.token(L" ", 1), rest.tokens(L" ", 2));
 	else if ( first.Compare(L"Date:") )				this->setCreationDate(rest);
 	else if ( first.Compare(L"WebAddress:") )		this->setWebAddress(rest);
 	else if ( first.Compare(L"WebSite:") )			this->setWebSite(rest);
 	else if ( first.Compare(L"Email:") )				this->setEmail(rest);
 	else if ( first.Compare(L"WebMirror1:") || first.Compare(L"Mirror1:") || first.Compare(L"WebMirror:") )
-		this->addWebMirror(rest.toString());
+		this->addWebMirror(rest);
 	else if ( first.Compare(L"WebMirror2:") || first.Compare(L"Mirror2:") )
-		this->addWebMirror(rest.toString());
+		this->addWebMirror(rest);
 	else if ( first.Compare(L"PluginType:") )		this->setPluginType(rest);
 	else if ( first.Compare(L"Desc:") )				this->setDescription(rest);
 	else if ( first.Compare(L"UninstallAfter:") )	this->addUninstallText(parseLanguage(rest.token(L"|", 1)), false, rest.tokens(L"|", 2));
 	else if ( first.Compare(L"UninstallBefore:") )	this->addUninstallText(parseLanguage(rest.token(L"|", 1)), true, rest.tokens(L"|", 2));
 	else if ( first.Compare(L"InstallAfter:") )		this->addInstallText(parseLanguage(rest.token(L"|", 1)), false, rest.tokens(L"|", 2));
 /*
 	Func:   ParseFiles
 	Input:  String - values in one long line
 	Desc:   splits the files data into each line to read the data
 */
-void CBaseFile::_readFiles(const Utils::String &values)
+void CBaseFile::_readFiles(const Utils::WString &values)
+{
-	int num = 0;
+	std::vector<Utils::WString> lines;
-	Utils::String *lines = values.tokenise(";\n", &num);
+	values.tokenise(L"\n";, lines);
-	for (int i = 0; i < num; i++)
+	for (size_t i = 0; i < lines.size(); i++)
 		_parseFilesLine(lines[i]);
-	CLEANSPLIT(lines, num)
+}
 /*
 	// read data to memory
 	unsigned char *readData = 0;
 	try {
 		readData = new unsigned char[m_SHeader.lValueCompressSize];
 	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [header], %d (%s)", m_SHeader.lValueCompressSize, e.what());
 		return -1;
+	}
 	if (!readData)
 		return -1;
 	unsigned char size[4];
 	File.read(size, 4);
 	File.read(readData, m_SHeader.lValueCompressSize);
 	unsigned long uncomprLen = (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
 	// check for zlib compression
 	if ( m_SHeader.iValueCompression == SPKCOMPRESS_ZLIB ) {
 		// uncomress the data
 		try {
 			unsigned char *uncompr = new unsigned char[uncomprLen];
 			int err = uncompress ( uncompr, &uncomprLen, readData, m_SHeader.lValueCompressSize );
 			// update the progress for each section
 			if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(2, iMaxProgress);
 			if (err == Z_OK)
+			{
-				if (m_SHeader.fVersion <= 4.3f)
+				if (m_SHeader.fVersion < 4.4f)
+				{
 					std::string data((const char*)uncompr);
 					_readValues(std::wstring(data.begin(), data.end()));
+				}
 				else
 		// update the progress for each section
 		if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(2, iMaxProgress);
 		if (compr)
+		{
-			if (m_SHeader.fVersion <= 4.3f)
+			if (m_SHeader.fVersion <= 4.4f)
+			{
 				std::string data((const char*)compr);
 				_readValues(std::wstring(data.begin(), data.end()));
+			}
 			else
+		}
+	}
 	// no compression
 	else
+	{
-		if (m_SHeader.fVersion <= 4.3f)
+		if (m_SHeader.fVersion <= 4.4f)
+		{
 			std::string data((const char*)readData);
 			_readValues(std::wstring(data.begin(), data.end()));
+		}
 		else
 		try {
 			unsigned char *uncompr = new unsigned char[uncomprLen];
 			int err = uncompress ( uncompr, &uncomprLen, readData, m_SHeader2.lSize );
 			// update the progress for each section
 			if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(5, iMaxProgress);
+			if (err == Z_OK)
+			{
+//#pragma warning(disable:4244)
+				if (m_SHeader.fVersion < 4.4f)
+				{
-			if ( err == Z_OK ) _readFiles((char *)uncompr);
+					std::string data((char*)uncompr);
+					_readFiles(std::wstring(data.begin(), data.end()));
+				}
+				else
+				{
+					std::wstring data((wchar_t*)uncompr);
+					_readFiles(data);
+				}
+//#pragma warning(enable:4244)
+			}
-			delete uncompr;
+			delete[] uncompr;
+		}
 		catch (std::exception &e) {
 			CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_FileHeader() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());
 			delete []readData;
 			return -1;
 	free ( valueCompr );
 	// now compress the files header
 	// create the files values
 	SSPKHeader2 header;
-	Utils::String files = createFilesLine(&header, progress);
+	Utils::WString files = createFilesLine(&header, progress);
 	// compress the files values
-	long fileUncomprLen = (long)files.length(), fileComprLen = fileUncomprLen;
+	long fileUncomprLen = (long)((wcslen(files.c_str()) * sizeof(wchar_t)) / sizeof(char)), fileComprLen = fileUncomprLen;
 	unsigned char *fileCompr = NULL;
 	compressed = false;
 	if ( fileUncomprLen )
+	{
 			if ( fileComprLen < 100 )
 				fileComprLen = 200;
 			else if ( fileComprLen < 1000 )
 				fileComprLen *= 2;
 			fileCompr = (unsigned char *)calloc((unsigned int)fileComprLen, 1);
-			int err = compress ( (unsigned char *)fileCompr, (unsigned long *)&fileComprLen, (const unsigned char *)files.c_str(), (unsigned long)files.length(), 0 );
+			int err = compress ( (unsigned char *)fileCompr, (unsigned long *)&fileComprLen, (const unsigned char *)files.c_str(), (unsigned long)fileUncomprLen, 0 );
 			if ( err == Z_OK )
 				compressed = true;
+		}
+	}
 	// if unable to compress, store it as plain text
 	if ( !compressed )
+	{
 		fileComprLen = fileUncomprLen;
 		fileCompr = (unsigned char *)calloc((unsigned int)fileComprLen, 1);
-		memcpy ( fileCompr, files.c_str(), fileComprLen );
+		memcpy ( fileCompr, (const unsigned char *)files.c_str(), fileComprLen );
 		fileheader = SPKCOMPRESS_NONE;
+	}
 	// now write the file header
 	header.lSize = fileComprLen;
 	else if (sFirst.Compare(L"ScriptName"))			addName(parseLanguage(sRest.token(L" ", 1)), sRest.tokens(L" ", 2));
 	else if (sFirst.Compare(L"UninstallBefore"))	this->addUninstallText(parseLanguage(sRest.token(L" ", 1)), true, sRest.tokens(L" ", 2));
 	else if (sFirst.Compare(L"UninstallAfter"))		this->addUninstallText(parseLanguage(sRest.token(L" ", 1)), false, sRest.tokens(L" ", 2));
 	else if (sFirst.Compare(L"InstallBefore"))		this->addInstallText(parseLanguage(sRest.token(L" ", 1)), true, sRest.tokens(L" ", 2));
 	else if (sFirst.Compare(L"InstallAfter"))		this->addInstallText(parseLanguage(sRest.token(L" ", 1)), false, sRest.tokens(L" ", 2));
-	else if (sFirst.Compare(L"Date"))				this->setCreationDate(sRest.toString());
+	else if (sFirst.Compare(L"Date"))				this->setCreationDate(sRest);
-	else if (sFirst.Compare(L"Version"))			this->setVersion(sRest.toString());
+	else if (sFirst.Compare(L"Version"))			this->setVersion(sRest);
 	else if (sFirst.Compare(L"GameVersion"))
-		this->AddGameCompatability(-1, sRest.toString());
+		this->AddGameCompatability(-1, sRest);
 	else if (sFirst.Compare(L"PluginType")) {
 		if (sRest.isNumber())						this->setPluginType(sRest);
 		else if (sRest.Compare(L"Normal"))			this->setPluginType(PLUGIN_NORMAL);
 		else if (sRest.Compare(L"Stable"))			this->setPluginType(PLUGIN_STABLE);
 		else if (sRest.Compare(L"Experimental"))	this->setPluginType(PLUGIN_EXPERIMENTAL);
 	else if (sFirst.Compare(L"GenerateUpdateFile"))
 		m_bAutoGenerateUpdateFile = true;
 	else if (sFirst.Compare(L"Game"))
+	{
 		Utils::WString sGame = sRest.token(L" ", 1);
-		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame.toString()), sRest.token(L" ", 2).toString());
+		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(L" ", 2));
+	}
-	else if (sFirst.Compare(L"Description"))		this->setDescription(sRest.toString());
+	else if (sFirst.Compare(L"Description"))		this->setDescription(sRest);
 	else if (sFirst.Compare(L"AutoSave") || sFirst.Compare(L"AutoExport") || sFirst.Compare(L"AutoRarExport") || sFirst.Compare(L"AutoZipExport"))
+	{
 		Utils::WString filename = _replaceFilename(sRest);
 		if (sFirst.Compare(L"AutoZipExport") || sFirst.Compare(L"AutoExport"))
-			this->setExportFilename(CFileIO(filename).changeFileExtension(L"zip").toString());
+			this->setExportFilename(CFileIO(filename).changeFileExtension(L"zip"));
 		else if (sFirst.Compare(L"AutoRarExport"))
-			this->setExportFilename(CFileIO(filename).changeFileExtension(L"rar").toString());
+			this->setExportFilename(CFileIO(filename).changeFileExtension(L"rar"));
 		else
 			this->setFilename(filename);
+	}
-	else if (sFirst.Compare(L"WebSite"))		this->setWebSite(sRest.toString());
+	else if (sFirst.Compare(L"WebSite"))		this->setWebSite(sRest);
-	else if (sFirst.Compare(L"ForumLink") || sFirst.Compare("Forum")) this->setForumLink(sRest.toString());
+	else if (sFirst.Compare(L"ForumLink") || sFirst.Compare("Forum")) this->setForumLink(sRest);
-	else if (sFirst.Compare(L"Email"))			this->setEmail(sRest.toString());
+	else if (sFirst.Compare(L"Email"))			this->setEmail(sRest);
-	else if (sFirst.Compare(L"WebAddress"))		this->setWebAddress(sRest.toString());
+	else if (sFirst.Compare(L"WebAddress"))		this->setWebAddress(sRest);
 	else if (sFirst.Compare(L"WebMirror"))
-		this->addWebMirror(sRest.toString());
+		this->addWebMirror(sRest);
 	else if (sFirst.Compare(L"WebMirror1"))
-		this->addWebMirror(sRest.toString());
+		this->addWebMirror(sRest);
 	else if (sFirst.Compare(L"WebMirror2"))
-		this->addWebMirror(sRest.toString());
+		this->addWebMirror(sRest);
 	else if (sFirst.Compare(L"Ftp"))
 		_sFtpAddr = sRest;
 	else if (sFirst.Compare(L"Ratings"))		_setRatings(sRest.token(L" ", 1), sRest.token(L" ", 2), sRest.token(L" ", 3));
 	else if (sFirst.Compare(L"EaseOfUse"))		setEaseOfUse(sRest);
 	else if (sFirst.Compare(L"GameChanging"))	setGameChanging(sRest);
+	{
 		Utils::WString version = sRest.token(L"|", 2);
 		Utils::WString name = sRest.token(L"|", 1);
 		Utils::WString author = sRest.tokens(L"|", 3);
-		this->addNeededLibrary(name, author, version.toString());
+		this->addNeededLibrary(name, author, version);
+	}
 	else if (sFirst.Compare(L"DependPackage"))
+	{
 		CPackages p;
 		CBaseFile *spk = p.openPackage(sRest, 0, 0, SPKREAD_VALUES);
+	}
 	else if (sFirst.Compare(L"Icon"))
+	{
 		C_File *icon = new C_File(sRest);
 		if (icon->ReadFromFile())
-			this->setIcon(icon, CFileIO(sRest).extension().toString());
+			this->setIcon(icon, CFileIO(sRest).extension());
+	}
 	else if (sFirst.Compare(L"CombineGameFiles"))
 		_bCombineFiles = sRest.Compare(L"true") || sRest.Compare(L"yes") || sRest.toInt();
 	else if (sFirst.Compare(L"UpdateFile"))
 		this->createUpdateFile(sRest);
 			std::vector<Utils::WString> games;
 			if(game.tokenise(L"|", games))
+			{
 				for (size_t i = 0; i < games.size(); ++i)
+				{
-					unsigned int g = CBaseFile::GetGameFromString(games[i].toString());
+					unsigned int g = CBaseFile::GetGameFromString(games[i]);
 					Utils::WString filename = CFileIO(file).dir() + L"/" + CFileIO(file).baseName() + L"_" + CBaseFile::ConvertGameToString(g) + L"." + ext;
-					this->addAutoExport(g, filename.toString());
+					this->addAutoExport(g, filename);
+				}
+			}
+		}
 		else
+		{
-			unsigned int g = CBaseFile::GetGameFromString(game.toString());
+			unsigned int g = CBaseFile::GetGameFromString(game);
 			Utils::WString filename = CFileIO(file).dir() + L"/" + CFileIO(file).baseName() + L"_" + CBaseFile::ConvertGameToString(g) + L"." + ext;
-			this->addAutoExport(g, filename.toString());
+			this->addAutoExport(g, filename);
+		}
+	}
 	else if (sFirst.Compare(L"Extract"))
+	{
 		Utils::WString game = sRest.word(1);
+		{
 			std::vector<Utils::WString> games;
 			if (game.tokenise(L"|", games))
+			{
 				for(size_t i = 0; i < games.size(); ++i)
-					this->addAutoExtract(CBaseFile::GetGameFromString(games[i].toString()), dir.toString());
+					this->addAutoExtract(CBaseFile::GetGameFromString(games[i]), dir);
+			}
+		}
 		else
-			this->addAutoExtract(CBaseFile::GetGameFromString(game.toString()), dir.toString());
+			this->addAutoExtract(CBaseFile::GetGameFromString(game), dir);
+	}
 	else
+	{
 		Utils::WString checkType = sFirst;
 		bool shared = false;
 void CBaseFile::addFileScript(FileType filetype, bool shared, bool packed, const Utils::WString &sRest, const Utils::WString &sMainGame, Utils::WStringList &otherGames, Utils::WStringList &gameAddons, CProgressInfo *progress)
+{
 	Utils::WString dir;
 	Utils::WString rest = sRest;
-	unsigned int mainGame = CBaseFile::GetGameFromString(sMainGame.toString());
+	unsigned int mainGame = CBaseFile::GetGameFromString(sMainGame);
 	unsigned int game = 0;
 	if ( rest.token(L" ", 1).left(4).Compare(L"GAME") ) {
 		Utils::WString gameStr = rest.token(L" ", 2);
 		if (gameStr.contains(L"|"))
+		{
 			std::vector<Utils::WString> games;
 			gameStr.tokenise(L"|", games);
 			for (size_t i = 0; i < games.size(); ++i)
+			{
-				unsigned int g = CBaseFile::GetGameFromString(games[i].toString());
+				unsigned int g = CBaseFile::GetGameFromString(games[i]);
 				if (g)
 					game |= 1 << g;
+			}
+		}
 		else
+		{
-			unsigned int g = CBaseFile::GetGameFromString(gameStr.toString());
+			unsigned int g = CBaseFile::GetGameFromString(gameStr);
 			if (g)
 				game = 1 << g;
+		}
 		rest = rest.tokens(L" ", 3);
+	}
 						CFileIO F(file);
 						for(Utils::WString g = otherGames.firstString(); !g.empty(); g = otherGames.nextString()) {
 							Utils::WString checkDir = F.dir() + L"/" + g;
 							if ( CDirIO(checkDir).exists(F.filename()) ) {
 								addGame = mainGame;
-								C_File *newfile = this->appendFile(CDirIO(checkDir).file(F.filename()), filetype, CBaseFile::GetGameFromString(g.toString()), packed, dir);
+								C_File *newfile = this->appendFile(CDirIO(checkDir).file(F.filename()), filetype, CBaseFile::GetGameFromString(g), packed, dir);
 								if (newfile && progress)
 									progress->UpdateFile(newfile);
 								if ( newfile ) newfile->SetShared(shared);
+							}
+						}
 			CFileIO F(rest);
 			for(Utils::WString g = otherGames.firstString(); !g.empty(); g = otherGames.nextString()) {
 				Utils::WString checkDir = F.dir() + L"/" + g;
 				if ( CDirIO(checkDir).exists(F.filename()) ) {
 					addGame = mainGame;
-					C_File *newfile = this->appendFile(CDirIO(checkDir).file(F.filename()), filetype, CBaseFile::GetGameFromString(g.toString()), packed, dir);
+					C_File *newfile = this->appendFile(CDirIO(checkDir).file(F.filename()), filetype, CBaseFile::GetGameFromString(g), packed, dir);
 					if (newfile && progress)
 						progress->UpdateFile(newfile);
 					if ( newfile ) newfile->SetShared(shared);
+				}
+			}
 	bool found = true;
 	while ( found )
+	{
 		++num;
 		found = false;
-		Utils::String find = Utils::String::PadNumber(num, 2);
+		Utils::WString find = Utils::WString::PadNumber(num, 2);
 		for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+		{
 			if ( node->Data()->GetFileType() != FILETYPE_MOD )
 				continue;
 			if ( !node->Data()->IsFakePatch() )
 				break;
+			}
+		}
+	}
-	Utils::String to = Utils::String::PadNumber(num, 2);
+	Utils::WString to = Utils::WString::PadNumber(num, 2);
 	C_File *match = this->findMatchingMod(f);
 	// file link
 	if ( !f->GetData() )
 		f->ReadFromFile();
+	}
 	return false;
+}
-Utils::String builtInWares()
+Utils::WString builtInWares()
+{
-	Utils::String str;
+	Utils::WString str;
-	str += "28;0;0;0;0;59;5753;0;35714;1;1;0;35714;-100000;0;0;SS_WARE_SW_NEW1;\n";
+	str += L"28;0;0;0;0;59;5753;0;35714;1;1;0;35714;-100000;0;0;SS_WARE_SW_NEW1;\n";
-	str += "28;0;0;0;0;60;5763;0;33232;1;1;0;33232;0;1043;0;SS_WARE_SW_NEW2;\n";
+	str += L"28;0;0;0;0;60;5763;0;33232;1;1;0;33232;0;1043;0;SS_WARE_SW_NEW2;\n";
-	str += "28;0;0;0;0;61;5773;0;21428;1;1;0;21428;0;1043;0;SS_WARE_SW_NEW3;\n";
+	str += L"28;0;0;0;0;61;5773;0;21428;1;1;0;21428;0;1043;0;SS_WARE_SW_NEW3;\n";
-	str += "28;0;0;0;0;62;5783;0;56;1;1;0;56;-100000;0;0;SS_WARE_SW_NEW4;\n";
+	str += L"28;0;0;0;0;62;5783;0;56;1;1;0;56;-100000;0;0;SS_WARE_SW_NEW4;\n";
-	str += "28;0;0;0;0;63;5793;0;88;1;1;0;88;-100000;0;0;SS_WARE_SW_NEW5;\n";
+	str += L"28;0;0;0;0;63;5793;0;88;1;1;0;88;-100000;0;0;SS_WARE_SW_NEW5;\n";
-	str += "28;0;0;0;0;64;5803;0;283;1;1;0;283;-100000;0;0;SS_WARE_SW_NEW6;\n";
+	str += L"28;0;0;0;0;64;5803;0;283;1;1;0;283;-100000;0;0;SS_WARE_SW_NEW6;\n";
-	str += "28;0;0;0;0;65;5813;0;383;1;1;0;383;-100000;0;0;SS_WARE_SW_NEW7;\n";
+	str += L"28;0;0;0;0;65;5813;0;383;1;1;0;383;-100000;0;0;SS_WARE_SW_NEW7;\n";
-	str += "28;0;0;0;0;66;5823;0;1389;1;1;0;1389;-100000;1043;0;SS_WARE_SW_NEW8;\n";
+	str += L"28;0;0;0;0;66;5823;0;1389;1;1;0;1389;-100000;1043;0;SS_WARE_SW_NEW8;\n";
-	str += "28;0;0;0;0;67;5833;0;3396;1;1;0;3396;-100000;0;0;SS_WARE_SW_NEW9;\n";
+	str += L"28;0;0;0;0;67;5833;0;3396;1;1;0;3396;-100000;0;0;SS_WARE_SW_NEW9;\n";
-	str += "28;0;0;0;0;68;5843;0;4215;1;1;0;4215;-100000;0;0;SS_WARE_SW_NEW10;\n";
+	str += L"28;0;0;0;0;68;5843;0;4215;1;1;0;4215;-100000;0;0;SS_WARE_SW_NEW10;\n";
-	str += "28;0;0;0;0;69;5853;0;5635;1;1;0;5635;-100000;0;0;SS_WARE_SW_NEW11;\n";
+	str += L"28;0;0;0;0;69;5853;0;5635;1;1;0;5635;-100000;0;0;SS_WARE_SW_NEW11;\n";
-	str += "28;0;0;0;0;70;5863;0;65735;1;1;0;65735;-100000;0;0;SS_WARE_SW_NEW12;\n";
+	str += L"28;0;0;0;0;70;5863;0;65735;1;1;0;65735;-100000;0;0;SS_WARE_SW_NEW12;\n";
-	str += "28;0;0;0;0;71;5873;0;17857;1;1;0;17857;333;1043;0;SS_WARE_SW_NEW13;\n";
+	str += L"28;0;0;0;0;71;5873;0;17857;1;1;0;17857;333;1043;0;SS_WARE_SW_NEW13;\n";
-	str += "28;0;0;0;0;72;5883;0;21428;1;1;0;21428;0;1043;0;SS_WARE_SW_NEW14;\n";
+	str += L"28;0;0;0;0;72;5883;0;21428;1;1;0;21428;0;1043;0;SS_WARE_SW_NEW14;\n";
-	str += "28;0;0;0;0;73;5893;0;324515;1;1;0;324515;-100000;0;0;SS_WARE_SW_NEW15;\n";
+	str += L"28;0;0;0;0;73;5893;0;324515;1;1;0;324515;-100000;0;0;SS_WARE_SW_NEW15;\n";
-	str += "28;0;0;0;0;74;5903;0;638508;1;1;0;638508;-100000;0;0;SS_WARE_SW_NEW16;\n";
+	str += L"28;0;0;0;0;74;5903;0;638508;1;1;0;638508;-100000;0;0;SS_WARE_SW_NEW16;\n";
-	str += "28;0;0;0;0;75;5913;0;225755;1;1;0;225755;-100000;0;0;SS_WARE_SW_NEW17;\n";
+	str += L"28;0;0;0;0;75;5913;0;225755;1;1;0;225755;-100000;0;0;SS_WARE_SW_NEW17;\n";
-	str += "28;0;0;0;0;76;5923;0;1931535;1;1;0;1931535;1000;0;0;SS_WARE_SW_NEW18;\n";
+	str += L"28;0;0;0;0;76;5923;0;1931535;1;1;0;1931535;1000;0;0;SS_WARE_SW_NEW18;\n";
-	str += "28;0;0;0;0;77;5933;0;2209150;1;1;0;2209150;-100000;0;0;SS_WARE_SW_NEW19;\n";
+	str += L"28;0;0;0;0;77;5933;0;2209150;1;1;0;2209150;-100000;0;0;SS_WARE_SW_NEW19;\n";
-	str += "28;0;0;0;0;78;5943;0;6727565;1;1;0;6727565;-100000;0;0;SS_WARE_SW_NEW20;\n";
+	str += L"28;0;0;0;0;78;5943;0;6727565;1;1;0;6727565;-100000;0;0;SS_WARE_SW_NEW20;\n";
-	str += "28;0;0;0;0;85;9999;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_1;\n";
+	str += L"28;0;0;0;0;85;9999;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_1;\n";
-	str += "28;0;0;0;0;86;15053;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_2;\n";
+	str += L"28;0;0;0;0;86;15053;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_2;\n";
-	str += "28;0;0;0;0;87;15063;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_3;\n";
+	str += L"28;0;0;0;0;87;15063;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_3;\n";
-	str += "28;0;0;0;0;88;15073;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_4;\n";
+	str += L"28;0;0;0;0;88;15073;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_4;\n";
-	str += "28;0;0;0;0;89;15083;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_5;\n";
+	str += L"28;0;0;0;0;89;15083;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_5;\n";
-	str += "28;0;0;0;0;90;15093;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_6;\n";
+	str += L"28;0;0;0;0;90;15093;0;105;1;5;0;105;0;1043;0;SS_WARE_SW_X3TC_6;\n";
 	return str;
+}
 void CBaseFile::_addWaresToList(int iLang, CLinkList<SWareEntry> &list, const Utils::WString &wares, enum WareTypes eType)

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 210 → 211